projects / framework / uifw / evas.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a5d9455 ae4bcf4)
Merge remote-tracking branch 'origin/upstream' into intefl/svn_merge
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 1 Aug 2012 08:11:26 +0000 (17:11 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 1 Aug 2012 08:11:26 +0000 (17:11 +0900)
commit49885d425b66f452d21584b913b2f741ac15875d
tree6a9627b4687bc30d0200c4b81034d0b2d84f58fbtree | snapshot
parenta5d94559a445fe49e6541cc55944307749d3239dcommit | diff
parentae4bcf423276602347da40f5f215b7dd54097177commit | diff
Merge remote-tracking branch 'origin/upstream' into intefl/svn_merge

Conflicts:
.gitignore
ChangeLog
src/lib/Evas_GL.h
src/lib/canvas/evas_gl.c
src/lib/canvas/evas_map.c
src/lib/canvas/evas_object_image.c
src/lib/canvas/evas_object_main.c
src/lib/canvas/evas_object_smart.c
src/lib/canvas/evas_render.c
src/lib/include/evas_private.h
src/modules/engines/gl_common/evas_gl_common.h
src/modules/engines/gl_common/evas_gl_texture.c
src/modules/engines/gl_x11/evas_engine.c
src/modules/loaders/gif/evas_image_load_gif.c
15 files changed:
.gitignore diff1 | diff2 | blob | history
src/lib/Evas_GL.h diff1 | diff2 | blob | history
src/lib/cache/evas_cache_image.c diff1 | diff2 | blob | history
src/lib/canvas/evas_map.c diff1 | diff2 | blob | history
src/lib/canvas/evas_object_image.c diff1 | diff2 | blob | history
src/lib/canvas/evas_render.c diff1 | diff2 | blob | history
src/lib/engines/common/evas_draw_main.c diff1 | diff2 | blob | history
src/lib/engines/common/evas_font_ot.c diff1 | diff2 | blob | history
src/lib/engines/common/evas_image_main.c diff1 | diff2 | blob | history
src/lib/engines/common/evas_scale_sample.c diff1 | diff2 | blob | history
src/modules/engines/gl_common/evas_gl_context.c diff1 | diff2 | blob | history
src/modules/engines/gl_common/evas_gl_texture.c diff1 | diff2 | blob | history
src/modules/engines/gl_x11/evas_engine.c diff1 | diff2 | blob | history
src/modules/engines/gl_x11/evas_x_main.c diff1 | diff2 | blob | history
src/modules/engines/software_generic/evas_engine.c diff1 | diff2 | blob | history
Domain: UI Framework / Uncategorized;