Revert "Revert "Upstream merge""
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 14 Aug 2012 11:16:49 +0000 (20:16 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 14 Aug 2012 11:16:49 +0000 (20:16 +0900)
commit369903c98c6617ef2e5cdc04eeccf2e247c55593
tree9b46d6703655da49f39e70baad85e461b6f393c1
parent98e51da6aef8546815e41c47f814b1659e914710
Revert "Revert "Upstream merge""

This reverts commit 91d469f4d69d875b6f5ae87c87465f50f63ad87d.

Conflicts:

ChangeLog
NEWS
packaging/evas.spec
188 files changed:
.gitignore
AUTHORS
ChangeLog
NEWS
README
configure.ac
doc/Makefile.am
doc/examples.dox
evas.pc.in
m4/evas_check_loader.m4
packaging/evas.spec
src/bin/Makefile.am
src/bin/dummy_slave.c [new file with mode: 0644]
src/bin/evas_cserve2.h [new file with mode: 0644]
src/bin/evas_cserve2_cache.c [new file with mode: 0644]
src/bin/evas_cserve2_client.c [new file with mode: 0644]
src/bin/evas_cserve2_fonts.c [new file with mode: 0644]
src/bin/evas_cserve2_main.c [new file with mode: 0644]
src/bin/evas_cserve2_main_loop_linux.c [new file with mode: 0644]
src/bin/evas_cserve2_messages.c [new file with mode: 0644]
src/bin/evas_cserve2_requests.c [new file with mode: 0644]
src/bin/evas_cserve2_shm.c [new file with mode: 0644]
src/bin/evas_cserve2_slave.c [new file with mode: 0644]
src/bin/evas_cserve2_slave.h [new file with mode: 0644]
src/bin/evas_cserve2_slaves.c [new file with mode: 0644]
src/bin/evas_cserve2_utils.c [new file with mode: 0644]
src/bin/loaders/Makefile.am [new file with mode: 0644]
src/bin/loaders/bmp/Makefile.am [new file with mode: 0644]
src/bin/loaders/bmp/evas_image_load_bmp.c [new file with mode: 0644]
src/bin/loaders/eet/Makefile.am [new file with mode: 0644]
src/bin/loaders/eet/evas_image_load_eet.c [new file with mode: 0644]
src/bin/loaders/ico/Makefile.am [new file with mode: 0644]
src/bin/loaders/ico/evas_image_load_ico.c [new file with mode: 0644]
src/bin/loaders/jpeg/Makefile.am [new file with mode: 0644]
src/bin/loaders/jpeg/evas_image_load_jpeg.c [new file with mode: 0644]
src/bin/loaders/pmaps/Makefile.am [new file with mode: 0644]
src/bin/loaders/pmaps/evas_image_load_pmaps.c [new file with mode: 0644]
src/bin/loaders/png/Makefile.am [new file with mode: 0644]
src/bin/loaders/png/evas_image_load_png.c [new file with mode: 0644]
src/bin/loaders/psd/Makefile.am [new file with mode: 0644]
src/bin/loaders/psd/evas_image_load_psd.c [new file with mode: 0644]
src/bin/loaders/tga/Makefile.am [new file with mode: 0644]
src/bin/loaders/tga/evas_image_load_tga.c [new file with mode: 0644]
src/bin/loaders/tiff/Makefile.am [new file with mode: 0644]
src/bin/loaders/tiff/evas_image_load_tiff.c [new file with mode: 0644]
src/bin/loaders/wbmp/Makefile.am [new file with mode: 0644]
src/bin/loaders/wbmp/evas_image_load_wbmp.c [new file with mode: 0644]
src/bin/loaders/xpm/Makefile.am [new file with mode: 0644]
src/bin/loaders/xpm/evas_image_load_xpm.c [new file with mode: 0644]
src/examples/Makefile.am
src/examples/evas-images3.c [new file with mode: 0644]
src/lib/Evas.h
src/lib/Evas_GL.h
src/lib/Makefile.am
src/lib/cache/Makefile.am
src/lib/cache/evas_cache.h
src/lib/cache/evas_cache_image.c
src/lib/cache2/Makefile.am [new file with mode: 0644]
src/lib/cache2/evas_cache2.c [new file with mode: 0644]
src/lib/cache2/evas_cache2.h [new file with mode: 0644]
src/lib/canvas/Makefile.am
src/lib/canvas/evas_callbacks.c
src/lib/canvas/evas_clip.c
src/lib/canvas/evas_events.c
src/lib/canvas/evas_main.c
src/lib/canvas/evas_map.c
src/lib/canvas/evas_object_box.c
src/lib/canvas/evas_object_grid.c
src/lib/canvas/evas_object_image.c
src/lib/canvas/evas_object_line.c
src/lib/canvas/evas_object_main.c
src/lib/canvas/evas_object_polygon.c
src/lib/canvas/evas_object_rectangle.c
src/lib/canvas/evas_object_smart.c
src/lib/canvas/evas_object_smart_clipped.c
src/lib/canvas/evas_object_table.c
src/lib/canvas/evas_object_text.c
src/lib/canvas/evas_object_textblock.c
src/lib/canvas/evas_object_textgrid.c [new file with mode: 0644]
src/lib/canvas/evas_render.c
src/lib/cserve2/Makefile.am [new file with mode: 0644]
src/lib/cserve2/evas_cs2.h [new file with mode: 0644]
src/lib/cserve2/evas_cs2_client.c [new file with mode: 0644]
src/lib/cserve2/evas_cs2_image_data.c [new file with mode: 0644]
src/lib/cserve2/evas_cs2_private.h [new file with mode: 0644]
src/lib/engines/common/Makefile.am
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_ot.c
src/lib/engines/common/evas_font_ot.h
src/lib/engines/common/evas_font_private.h
src/lib/engines/common/evas_font_query.c
src/lib/engines/common/evas_image.h
src/lib/engines/common/evas_image_load.c
src/lib/engines/common/evas_image_main.c
src/lib/engines/common/evas_image_private.h
src/lib/engines/common/evas_image_scalecache.c
src/lib/engines/common/evas_line_main.c
src/lib/engines/common/evas_map_image.c
src/lib/engines/common/evas_pipe.c
src/lib/engines/common/evas_pipe.h
src/lib/engines/common/evas_polygon_main.c
src/lib/engines/common/evas_rectangle_main.c
src/lib/engines/common/evas_scale_sample.c
src/lib/engines/common/evas_scale_smooth_scaler_downx.c
src/lib/engines/common/evas_scale_smooth_scaler_downx_downy.c
src/lib/engines/common/evas_scale_smooth_scaler_downy.c
src/lib/engines/common/evas_scale_smooth_scaler_noscale.c
src/lib/engines/common/evas_scale_smooth_scaler_up.c
src/lib/engines/common/evas_text_utils.c
src/lib/engines/common/evas_text_utils.h
src/lib/file/Makefile.am
src/lib/include/evas_common.h
src/lib/include/evas_inline.x
src/lib/include/evas_private.h
src/lib/main.c
src/modules/engines/buffer/Makefile.am
src/modules/engines/buffer/evas_outbuf.c
src/modules/engines/direct3d/Makefile.am
src/modules/engines/direct3d/evas_engine.c
src/modules/engines/directfb/Makefile.am
src/modules/engines/directfb/evas_engine.c
src/modules/engines/fb/Makefile.am
src/modules/engines/gl_cocoa/Makefile.am
src/modules/engines/gl_cocoa/evas_engine.c
src/modules/engines/gl_common/Makefile.am
src/modules/engines/gl_common/evas_gl_font.c
src/modules/engines/gl_common/evas_gl_line.c
src/modules/engines/gl_sdl/Makefile.am
src/modules/engines/gl_sdl/evas_engine.c
src/modules/engines/gl_x11/Makefile.am
src/modules/engines/gl_x11/evas_engine.c
src/modules/engines/psl1ght/Makefile.am
src/modules/engines/software_16/evas_engine.c
src/modules/engines/software_16_ddraw/Makefile.am
src/modules/engines/software_16_sdl/Makefile.am
src/modules/engines/software_16_sdl/evas_engine.c
src/modules/engines/software_16_wince/Makefile.am
src/modules/engines/software_16_x11/Makefile.am
src/modules/engines/software_8/evas_engine.c
src/modules/engines/software_8_x11/Makefile.am
src/modules/engines/software_ddraw/Makefile.am
src/modules/engines/software_gdi/Makefile.am
src/modules/engines/software_gdi/evas_outbuf.c
src/modules/engines/software_generic/Makefile.am
src/modules/engines/software_generic/evas_engine.c
src/modules/engines/software_x11/Makefile.am
src/modules/engines/software_x11/evas_engine.c
src/modules/engines/software_x11/evas_engine.h
src/modules/engines/software_x11/evas_xcb_buffer.c
src/modules/engines/software_x11/evas_xcb_outbuf.c
src/modules/engines/software_x11/evas_xcb_outbuf.h
src/modules/engines/software_x11/evas_xlib_buffer.c
src/modules/engines/software_x11/evas_xlib_outbuf.c
src/modules/engines/software_x11/evas_xlib_outbuf.h
src/modules/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
src/modules/engines/wayland_egl/Makefile.am
src/modules/engines/wayland_egl/evas_engine.c
src/modules/engines/wayland_egl/evas_wl_main.c
src/modules/engines/wayland_shm/Evas_Engine_Wayland_Shm.h
src/modules/engines/wayland_shm/Makefile.am
src/modules/loaders/bmp/Makefile.am
src/modules/loaders/edb/Makefile.am
src/modules/loaders/eet/Makefile.am
src/modules/loaders/generic/Makefile.am
src/modules/loaders/gif/Makefile.am
src/modules/loaders/ico/Makefile.am
src/modules/loaders/jpeg/Makefile.am
src/modules/loaders/pmaps/Makefile.am
src/modules/loaders/png/Makefile.am
src/modules/loaders/psd/Makefile.am
src/modules/loaders/svg/Makefile.am
src/modules/loaders/svg/evas_image_load_esvg.c [new file with mode: 0644]
src/modules/loaders/svg/evas_image_load_svg.c [deleted file]
src/modules/loaders/tga/Makefile.am
src/modules/loaders/tiff/Makefile.am
src/modules/loaders/wbmp/Makefile.am
src/modules/loaders/xpm/Makefile.am
src/modules/loaders/xpm/evas_image_load_xpm.c
src/modules/savers/edb/Makefile.am
src/modules/savers/eet/Makefile.am
src/modules/savers/jpeg/Makefile.am
src/modules/savers/png/Makefile.am
src/modules/savers/tiff/Makefile.am
src/tests/evas_test_textblock.c