On Wed, Sep 4, 2013 at 3:37 PM, Chris Michael - Enlightenment Git <[email protected]> wrote: > devilhorns pushed a commit to branch master. > > commit 03604a15b6158fdefcfb0f833567dbf91b38c659 > Merge: 88cc896 609941e > Author: Chris Michael <[email protected]> > Date: Wed Sep 4 14:36:29 2013 +0100 > > Merge branch 'framespace'
May I say that we did agree against merging branch... > src/lib/ecore_wayland/Ecore_Wayland.h | 48 +++++++-- > src/lib/ecore_wayland/ecore_wl_window.c | 118 > ++++++++++++--------- > .../engines/wayland/ecore_evas_wayland_common.c | 3 +- > .../engines/wayland/ecore_evas_wayland_egl.c | 28 +++-- > .../engines/wayland/ecore_evas_wayland_shm.c | 28 +++-- > src/modules/evas/engines/wayland_egl/evas_engine.c | 1 + > src/modules/evas/engines/wayland_shm/evas_engine.c | 11 +- > src/modules/evas/engines/wayland_shm/evas_engine.h | 6 +- > 8 files changed, 147 insertions(+), 96 deletions(-) > > -- > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > Discover the easy way to master current and previous Microsoft technologies > and advance your career. Get an incredible 1,500+ hours of step-by-step > tutorial videos with LearnDevNow. Subscribe today and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > -- Cedric BAIL ------------------------------------------------------------------------------ Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
