fix long standing layer set bug

[profile/ivi/evas.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 0a0a241..e4dda37 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -908,8 +908,20 @@
 2012-07-24  Ingvaldur Sigurjonsson
 
        * Fix typoe in docs
+<<<<<<< .mine
 
 2012-07-24  Hermet (ChunEon Park)
 
        * Fixed evas_gl resource list have cleared properly when it is released
        so it would be no problem when it is reinitialized in one same process.
+
+2012-07-24  Cedric Bail
+
+       * Handle Proxy with the right context.
+
+2012-07-24  Carsten Haitzler (The Rasterman)
+
+        * Fix long-standing bug when changing layer of a smart object,
+        its children dont change their layer value and pointer with it, thus
+        getting layer from them get you the wrong one.
+