Revert "Revert "Merge remote-tracking branch 'remotes/origin/upstream'""
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 14 Aug 2012 11:55:12 +0000 (20:55 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 14 Aug 2012 11:55:12 +0000 (20:55 +0900)
commit756be72ac8b8012378eb833c54dc47d5a4f4fbcb
treedba458205aa63f57fa95a1ae1690e97dd6e7a980
parentb0d9a4bb77e16085ee163e60730067a07edcba09
Revert "Revert "Merge remote-tracking branch 'remotes/origin/upstream'""

This reverts commit 18047243bf3b564d56049e7d7955f13922818ddd.
28 files changed:
ChangeLog
src/lib/ecore/ecore.c
src/lib/ecore/ecore_exe.c
src/lib/ecore_con/dns.c
src/lib/ecore_con/ecore_con.c
src/lib/ecore_evas/ecore_evas.c
src/lib/ecore_evas/ecore_evas_ews.c
src/lib/ecore_evas/ecore_evas_util.c
src/lib/ecore_evas/ecore_evas_x.c
src/lib/ecore_imf/Ecore_IMF.h
src/lib/ecore_imf_evas/ecore_imf_evas.c
src/lib/ecore_input/Ecore_Input.h
src/lib/ecore_input/Makefile.am
src/lib/ecore_input/ecore_input.c
src/lib/ecore_input/ecore_input_compose.c [new file with mode: 0644]
src/lib/ecore_input/ecore_input_compose.h [new file with mode: 0644]
src/lib/ecore_input_evas/ecore_input_evas.c
src/lib/ecore_x/Ecore_X.h
src/lib/ecore_x/xcb/ecore_xcb_events.c
src/lib/ecore_x/xcb/ecore_xcb_keymap.c
src/lib/ecore_x/xcb/ecore_xcb_private.h
src/lib/ecore_x/xcb/ecore_xcb_selection.c
src/lib/ecore_x/xcb/ecore_xcb_window.c
src/lib/ecore_x/xlib/ecore_x.c
src/lib/ecore_x/xlib/ecore_x_events.c
src/lib/ecore_x/xlib/ecore_x_private.h
src/modules/immodules/ibus/ibus_imcontext.c
src/modules/immodules/xim/ecore_imf_xim.c