projects / profile / ivi / evas.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a9788c2 49885d4)
Merge remote-tracking branch 'origin/intefl/svn_merge'
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 14 Aug 2012 11:43:12 +0000 (20:43 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 14 Aug 2012 11:43:12 +0000 (20:43 +0900)
commit9194c3c3fe005563b3ead579d799ed02437e05c6
treed5ea9ec0816f09a5fde0d0871d78fefa295fa46dtree | snapshot
parenta9788c2e90e67b703986cff86cf04dc2915b1515commit | diff
parent49885d425b66f452d21584b913b2f741ac15875dcommit | diff
Merge remote-tracking branch 'origin/intefl/svn_merge'

Conflicts:
src/lib/canvas/evas_map.c
src/lib/canvas/evas_object_smart.c
src/modules/engines/gl_common/evas_gl_common.h
src/modules/engines/gl_x11/evas_engine.c
src/lib/Evas_GL.h diff1 | diff2 | blob | history
src/modules/engines/gl_x11/evas_engine.c diff1 | diff2 | blob | history
Domain: UI Framework / Uncategorized;