projects / framework / uifw / evas.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7132177 a653467)
[efl-upgrade]
authorJeahwan Kim <jae.hwan.kim@samsung.com>
Fri, 10 Sep 2010 10:47:12 +0000 (19:47 +0900)
committerJeahwan Kim <jae.hwan.kim@samsung.com>
Fri, 10 Sep 2010 10:47:12 +0000 (19:47 +0900)
commit01858ce0af5d0b17086578929c6ef490b5498c46
treec3b2897446c3f9607aaec007595e8d17a6a9cb5btree | snapshot
parent713217706900543d901c692e83b281195e0e517dcommit | diff
parenta6534678c82a67422bf6b40539ae65c5d1f4152fcommit | diff
[efl-upgrade]
Merge with EFL svn repo

Merge branch 'svn_merge'

Conflicts:
src/lib/canvas/evas_object_textblock.c
src/lib/engines/common/evas_font_draw.c
src/lib/engines/common/evas_image_load.c
src/modules/engines/gl_x11/evas_engine.c
src/modules/engines/gl_x11/evas_x_main.c
src/modules/loaders/bmp/evas_image_load_bmp.c
15 files changed:
configure.ac diff1 | diff2 | blob | history
debian/changelog diff1 | | blob | history
debian/control diff1 | | blob | history
m4/evas_check_loader.m4 diff1 | diff2 | blob | history
src/lib/canvas/evas_object_textblock.c diff1 | diff2 | blob | history
src/lib/engines/common/evas_image_load.c diff1 | diff2 | blob | history
src/lib/engines/common/evas_op_blend/op_blend_mask_color_neon.c diff1 | diff2 | blob | history
src/lib/file/evas_module.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/loaders/bmp/evas_image_load_bmp.c diff1 | diff2 | blob | history
src/modules/loaders/gif/evas_image_load_gif.c diff1 | diff2 | blob | history
src/modules/loaders/jpeg/evas_image_load_jpeg.c diff1 | diff2 | blob | history
src/modules/loaders/png/evas_image_load_png.c diff1 | diff2 | blob | history
src/modules/loaders/wbmp/evas_image_load_wbmp.c diff1 | | blob | history
Domain: UI Framework / Uncategorized;