EFL core migration revision 68831
authorJeonghyun Yun <jh0506.yun@samsung.com>
Wed, 7 Mar 2012 06:54:35 +0000 (15:54 +0900)
committerJeonghyun Yun <jh0506.yun@samsung.com>
Wed, 7 Mar 2012 06:55:41 +0000 (15:55 +0900)
Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
src/modules/loaders/jpeg/evas_image_load_jpeg.c

1  2 
src/lib/Evas.h
src/modules/loaders/jpeg/evas_image_load_jpeg.c

diff --cc src/lib/Evas.h
Simple merge