EFL core migration revision 68518
authorJeonghyun Yun <jh0506.yun@samsung.com>
Wed, 29 Feb 2012 06:55:20 +0000 (01:55 -0500)
committerJeonghyun Yun <jh0506.yun@samsung.com>
Fri, 2 Mar 2012 07:56:29 +0000 (02:56 -0500)
commit24dadedc9e4145eff662cfbc7badef6785f1b4b0
tree4c0afe4787381948318df0363e866916c146030d
parentd6d0ede64e6a0fae6738b3154cecef58f35c0cfd
parentb97d66408cf49aa1f4fb12a6ab9cfdd1058a45cd
EFL core migration revision 68518
Merge remote-tracking branch 'origin/upstream'

Conflicts:
src/lib/canvas/evas_render.c
src/modules/engines/gl_x11/evas_engine.c
src/modules/loaders/gif/evas_image_load_gif.c
m4/evas_check_engine.m4
src/lib/canvas/evas_object_image.c
src/lib/canvas/evas_render.c
src/modules/engines/gl_common/evas_gl_line.c
src/modules/engines/gl_x11/evas_engine.c
src/modules/loaders/gif/evas_image_load_gif.c