Revert "Revert "Upstream merge""
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 14 Aug 2012 11:54:57 +0000 (20:54 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 14 Aug 2012 11:54:57 +0000 (20:54 +0900)
commitb0d9a4bb77e16085ee163e60730067a07edcba09
tree9972f3c1630b88f66291c71550b50119b1c50da9
parent6e06138ad138a22fa6e70e6a18f2504e86c73679
Revert "Revert "Upstream merge""

This reverts commit 1d514bb31a4ceedbf432f2a5b185e929e0d85a88.

Conflicts:

packaging/ecore.spec
90 files changed:
AUTHORS
ChangeLog
NEWS
README
configure.ac
doc/Makefile.am
doc/examples.dox
ecore.pc.in
m4/ecore_check_options.m4
m4/efl_compiler.m4 [new file with mode: 0644]
packaging/ecore.spec
po/cs.po
po/de.po
po/el.po
po/fr.po
po/it.po
po/nl.po
po/pt.po
po/sl.po
src/examples/Makefile.am
src/examples/ecore_exe_example.c [new file with mode: 0644]
src/examples/ecore_exe_example_child.c [new file with mode: 0644]
src/examples/ecore_imf_example.c [new file with mode: 0644]
src/lib/ecore/Ecore.h
src/lib/ecore/ecore.c
src/lib/ecore/ecore_alloc.c
src/lib/ecore/ecore_anim.c
src/lib/ecore/ecore_exe.c
src/lib/ecore/ecore_main.c
src/lib/ecore/ecore_private.h
src/lib/ecore/ecore_signal.c
src/lib/ecore/ecore_thread.c
src/lib/ecore_con/Ecore_Con.h
src/lib/ecore_con/Makefile.am
src/lib/ecore_con/dns.c [new file with mode: 0644]
src/lib/ecore_con/dns.h [new file with mode: 0644]
src/lib/ecore_con/ecore_con.c
src/lib/ecore_con/ecore_con_alloc.c
src/lib/ecore_con/ecore_con_dns.c [new file with mode: 0644]
src/lib/ecore_con/ecore_con_local.c
src/lib/ecore_con/ecore_con_private.h
src/lib/ecore_con/ecore_con_socks.c
src/lib/ecore_directfb/Ecore_DirectFB.h
src/lib/ecore_evas/Ecore_Evas.h
src/lib/ecore_evas/ecore_evas.c
src/lib/ecore_evas/ecore_evas_directfb.c
src/lib/ecore_evas/ecore_evas_fb.c
src/lib/ecore_evas/ecore_evas_wayland_egl.c
src/lib/ecore_evas/ecore_evas_wayland_shm.c
src/lib/ecore_evas/ecore_evas_win32.c
src/lib/ecore_evas/ecore_evas_x.c
src/lib/ecore_file/ecore_file_monitor_inotify.c
src/lib/ecore_imf/ecore_imf_context.c
src/lib/ecore_imf_evas/ecore_imf_evas.c
src/lib/ecore_ipc/Ecore_Ipc.h
src/lib/ecore_ipc/Makefile.am
src/lib/ecore_ipc/ecore_ipc.c
src/lib/ecore_ipc/ecore_ipc_private.h
src/lib/ecore_wayland/Ecore_Wayland.h
src/lib/ecore_wayland/ecore_wl.c
src/lib/ecore_wayland/ecore_wl_dnd.c
src/lib/ecore_wayland/ecore_wl_input.c
src/lib/ecore_wayland/ecore_wl_private.h
src/lib/ecore_wayland/ecore_wl_window.c
src/lib/ecore_win32/Makefile.am
src/lib/ecore_win32/ecore_win32_cursor.c
src/lib/ecore_x/Ecore_X.h
src/lib/ecore_x/Ecore_X_Atoms.h
src/lib/ecore_x/ecore_x_atoms_decl.h
src/lib/ecore_x/xcb/ecore_xcb.c
src/lib/ecore_x/xcb/ecore_xcb_atoms.c
src/lib/ecore_x/xcb/ecore_xcb_e.c
src/lib/ecore_x/xcb/ecore_xcb_randr.c
src/lib/ecore_x/xlib/ecore_x.c
src/lib/ecore_x/xlib/ecore_x_atoms.c
src/lib/ecore_x/xlib/ecore_x_e.c
src/lib/ecore_x/xlib/ecore_x_events.c
src/lib/ecore_x/xlib/ecore_x_private.h
src/lib/ecore_x/xlib/ecore_x_randr_11.c
src/lib/ecore_x/xlib/ecore_x_randr_12.c
src/lib/ecore_x/xlib/ecore_x_test.c
src/modules/immodules/Makefile.am
src/modules/immodules/ibus/Makefile.am [new file with mode: 0644]
src/modules/immodules/ibus/ibus_imcontext.c [new file with mode: 0644]
src/modules/immodules/ibus/ibus_imcontext.h [new file with mode: 0644]
src/modules/immodules/ibus/ibus_module.c [new file with mode: 0644]
src/modules/immodules/scim/scim_imcontext.cpp
src/modules/immodules/xim/ecore_imf_xim.c
src/tests/ecore_test_ecore.c
src/tests/ecore_test_ecore_x.c