Revert "upstream merge"
authorWooHyun Jung <wh0705.jung@samsung.com>
Fri, 27 Jul 2012 02:31:29 +0000 (11:31 +0900)
committerWooHyun Jung <wh0705.jung@samsung.com>
Fri, 27 Jul 2012 02:31:29 +0000 (11:31 +0900)
commit9a680a724ae10baa8bfdccfae5d648afd6fb64c6
tree251cfb02eff79ce3cec3acc96fc84ace9f8dad82
parent39b4ce83d7325c8760decf70566dad615c09d506
Revert "upstream merge"

This reverts commit afbce5cf5a761aa944a816915ccbd26a8d86b4c3, reversing
changes made to 7010b890b3295e226c62605d48a8e696cd13638b.

Conflicts:

ChangeLog
55 files changed:
.gitignore
ChangeLog
Makefile.am
NEWS
configure.ac
evas-software-16-ddraw.pc.in [new file with mode: 0644]
m4/evas_check_engine.m4
packaging/evas.spec
src/bin/Makefile.am
src/bin/dummy_slave.c
src/bin/evas_cserve2.h
src/bin/evas_cserve2_cache.c
src/bin/evas_cserve2_client.c
src/bin/evas_cserve2_debug.c [deleted file]
src/bin/evas_cserve2_fonts.c
src/bin/evas_cserve2_main.c
src/bin/evas_cserve2_main_loop_linux.c
src/bin/evas_cserve2_requests.c
src/bin/evas_cserve2_shm.c
src/bin/evas_cserve2_slave.c
src/bin/evas_cserve2_slaves.c
src/bin/evas_cserve2_usage.c [deleted file]
src/lib/Evas.h
src/lib/Makefile.am
src/lib/canvas/evas_font_dir.c
src/lib/canvas/evas_object_textblock.c
src/lib/canvas/evas_object_textgrid.c
src/lib/cserve2/Makefile.am
src/lib/cserve2/evas_cs2.h
src/lib/cserve2/evas_cs2_client.c
src/lib/cserve2/evas_cs2_private.h
src/lib/cserve2/evas_cs2_utils.c [deleted file]
src/lib/cserve2/evas_cs2_utils.h [deleted file]
src/lib/engines/common/evas_font.h
src/lib/engines/common/evas_font_default_walk.x
src/lib/engines/common/evas_font_draw.c
src/lib/engines/common/evas_font_load.c
src/lib/engines/common/evas_font_main.c
src/lib/engines/common/evas_font_query.c
src/lib/engines/common/evas_text_utils.c
src/lib/engines/common/evas_text_utils.h
src/lib/file/evas_module.c
src/lib/include/evas_common.h
src/lib/include/evas_private.h
src/modules/engines/Makefile.am
src/modules/engines/gl_x11/evas_x_main.c
src/modules/engines/software_16_ddraw/Evas_Engine_Software_16_DDraw.h [new file with mode: 0644]
src/modules/engines/software_16_ddraw/Makefile.am [new file with mode: 0644]
src/modules/engines/software_16_ddraw/evas_ddraw_buffer.cpp [new file with mode: 0644]
src/modules/engines/software_16_ddraw/evas_ddraw_main.cpp [new file with mode: 0644]
src/modules/engines/software_16_ddraw/evas_engine.c [new file with mode: 0644]
src/modules/engines/software_16_ddraw/evas_engine.h [new file with mode: 0644]
src/modules/engines/software_generic/evas_engine.c
src/modules/engines/wayland_egl/evas_engine.c
src/tests/evas_test_textblock.c