On 09/02/15 21:17, Cedric BAIL wrote: > cedric pushed a commit to branch master. > > http://git.enlightenment.org/core/efl.git/commit/?id=6f3f92b72a2e600718eadead399346ede47de199 > > commit 6f3f92b72a2e600718eadead399346ede47de199 > Merge: 2d40315 d5496b0 > Author: Cedric BAIL <ced...@osg.samsung.com> > Date: Mon Feb 9 22:16:51 2015 +0100 > > Merge branch 'devs/cedric/next' > > Just merging patch that did come during the end of our last release > cycle and couldn't > get in as they were to much of a new feature. > > src/benchmarks/eina/eina_bench.c | 4 + > src/bin/edje/edje_cc.h | 2 + > src/bin/edje/edje_cc_out.c | 174 > +++++++++++++++++++++ > src/lib/edje/edje_private.h | 1 - > src/lib/eldbus/eldbus_proxy.c | 53 +++---- > src/lib/evas/Evas_Eo.h | 12 +- > src/lib/evas/canvas/evas_3d_node.c | 80 +++++++--- > src/lib/evas/include/evas_private.h | 10 ++ > src/modules/evas/engines/gl_common/evas_gl_3d.c | 166 > ++++++++++++++++++-- > .../evas/engines/gl_common/evas_gl_3d_common.h | 3 + > .../evas/engines/gl_common/evas_gl_3d_private.h | 6 +- > .../evas/engines/gl_common/evas_gl_3d_shader.c | 15 +- > src/modules/evas/engines/gl_generic/evas_engine.c | 33 ++++ > src/tests/ecore/ecore_test_ecore_con.c | 69 ++++++-- > 14 files changed, 543 insertions(+), 85 deletions(-) >
Hey, We don't merge such things, we rebase (which seems like you have). Bottom line, no need for this merge commit, especially with this shitty commit message. :) -- Tom. ------------------------------------------------------------------------------ Dive into the World of Parallel Programming. The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
