From: discomfitor <discomfitor>
Date: Sat, 14 Jan 2012 04:08:01 +0000 (+0000)
Subject: stragglers from 67197
X-Git-Tag: submit/2.0alpha-wayland/20121127.221958~436
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e8516a75395d75aee3d5f4f0ef5e55f74768b446;p=profile%2Fivi%2Fedje.git

stragglers from 67197


git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@67206 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

diff --git a/ChangeLog b/ChangeLog
index e10dbf7..ae65d85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -282,3 +282,6 @@
 
 	* Lua: Added edje.version().
 
+2012-01-14  Carsten Haitzler (The Rasterman)
+
+        * Added minmul propery for edje to multiply minimum size during min size calc
diff --git a/NEWS b/NEWS
index da4348c..bf529dc 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Additions:
     * "recalc" smart callback for object size changes
     * EDJE_ASPECT_PREFER_SOURCE.
     * edje.version() Lua function.
+    * minmul edc property
 
 Improvements:
     * speedup load time of Edje file.