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)
commita2eba425ccbf41c0c7214a8e22e015c432c8737b
tree0815f9f53cc51892271cc3fe5c7699904d142303
parent6fb1522a7834d88b1a8bb558d83429c08e9ad64c
parenta2870df035878b44cb211bf7ff29e6008f318f81
EFL core migration revision 68831
Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
src/modules/loaders/jpeg/evas_image_load_jpeg.c
src/lib/Evas.h
src/modules/loaders/jpeg/evas_image_load_jpeg.c