On Tue, Jul 24, 2012 at 6:59 AM, Enlightenment SVN <[email protected]> wrote: > Log: > fix long standing layer set bug > > > > Author: raster > Date: 2012-07-23 21:59:22 -0700 (Mon, 23 Jul 2012) > New Revision: 74342 > Trac: http://trac.enlightenment.org/e/changeset/74342 > > Modified: > trunk/evas/ChangeLog trunk/evas/src/lib/canvas/evas_layer.c > > Modified: trunk/evas/ChangeLog > =================================================================== > --- trunk/evas/ChangeLog 2012-07-24 04:35:08 UTC (rev 74341) > +++ trunk/evas/ChangeLog 2012-07-24 04:59:22 UTC (rev 74342) > @@ -908,6 +908,7 @@ > 2012-07-24 Ingvaldur Sigurjonsson > > * Fix typoe in docs > +<<<<<<< .mine > > 2012-07-24 Hermet (ChunEon Park)
conflict ? Vincent ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
