review.tizen.org Git - framework/uifw/ecore.git/commit

author	Jaehwan Kim <jae.hwan.kim@samsung.com>
	Tue, 7 Aug 2012 08:51:14 +0000 (17:51 +0900)
committer	Jaehwan Kim <jae.hwan.kim@samsung.com>
	Tue, 14 Aug 2012 13:40:11 +0000 (22:40 +0900)
commit	a6f7e0554f46ebdb5ed93727472ecb380679af51
tree	8733cc9124c6c58d30c414c56a48865a17e463e4	tree \| snapshot
parent	756be72ac8b8012378eb833c54dc47d5a4f4fbcb	commit \| diff

EFL core migration @74576
Merge remote-tracking branch 'origin/upstream' into HEAD

Conflicts:
ChangeLog
NEWS
src/lib/ecore/ecore_thread.c
src/lib/ecore_evas/Ecore_Evas.h
src/lib/ecore_evas/ecore_evas_wayland_shm.c
src/lib/ecore_evas/ecore_evas_x.c
src/lib/ecore_imf/Ecore_IMF.h
src/lib/ecore_imf/ecore_imf_context.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_atoms.c
src/lib/ecore_x/xcb/ecore_xcb_e.c
src/lib/ecore_x/xlib/ecore_x_atoms.c

Conflicts:

ChangeLog
NEWS
configure.ac
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/ecore_exe_example.c
src/examples/ecore_exe_example_child.c
src/examples/ecore_imf_example.c
src/lib/ecore_con/ecore_con_dns.c
src/lib/ecore_evas/ecore_evas_wayland_egl.c
src/lib/ecore_evas/ecore_evas_wayland_shm.c
src/lib/ecore_imf/Ecore_IMF.h
src/lib/ecore_input/Ecore_Input.h
src/lib/ecore_wayland/Ecore_Wayland.h
src/lib/ecore_wayland/ecore_wl_input.c
src/lib/ecore_wayland/ecore_wl_window.c
src/lib/ecore_x/Ecore_X.h
src/modules/immodules/ibus/ibus_imcontext.c
src/modules/immodules/ibus/ibus_module.c
src/modules/immodules/xim/ecore_imf_xim.c

ChangeLog		diff \| blob \| history
NEWS		diff \| blob \| history
README		diff \| blob \| history
configure.ac		diff \| blob \| history
po/cs.po		diff \| blob \| history
po/de.po		diff \| blob \| history
po/el.po		diff \| blob \| history
po/fr.po		diff \| blob \| history
po/it.po		diff \| blob \| history
po/nl.po		diff \| blob \| history
po/pt.po		diff \| blob \| history
po/sl.po		diff \| blob \| history
src/examples/ecore_animator_example.c		diff \| blob \| history
src/examples/ecore_client_bench.c		diff \| blob \| history
src/examples/ecore_con_client_example.c		diff \| blob \| history
src/examples/ecore_con_client_simple_example.c		diff \| blob \| history
src/examples/ecore_con_lookup_example.c		diff \| blob \| history
src/examples/ecore_con_server_example.c		diff \| blob \| history
src/examples/ecore_con_server_http_example.c		diff \| blob \| history
src/examples/ecore_con_server_simple_example.c		diff \| blob \| history
src/examples/ecore_con_url_cookies_example.c		diff \| blob \| history
src/examples/ecore_con_url_download_example.c		diff \| blob \| history
src/examples/ecore_con_url_headers_example.c		diff \| blob \| history
src/examples/ecore_evas_basics_example.c		diff \| blob \| history
src/examples/ecore_evas_buffer_example_01.c		diff \| blob \| history
src/examples/ecore_evas_buffer_example_02.c		diff \| blob \| history
src/examples/ecore_evas_callbacks.c		diff \| blob \| history
src/examples/ecore_evas_ews_example.c		diff \| blob \| history
src/examples/ecore_evas_object_example.c		diff \| blob \| history
src/examples/ecore_evas_window_sizes_example.c		diff \| blob \| history
src/examples/ecore_event_example_01.c		diff \| blob \| history
src/examples/ecore_event_example_02.c		diff \| blob \| history
src/examples/ecore_exe_example.c		diff \| blob \| history
src/examples/ecore_exe_example_child.c		diff \| blob \| history
src/examples/ecore_fd_handler_example.c		diff \| blob \| history
src/examples/ecore_fd_handler_gnutls_example.c		diff \| blob \| history
src/examples/ecore_file_download_example.c		diff \| blob \| history
src/examples/ecore_idler_example.c		diff \| blob \| history
src/examples/ecore_imf_example.c		diff \| blob \| history
src/examples/ecore_job_example.c		diff \| blob \| history
src/examples/ecore_pipe_gstreamer_example.c		diff \| blob \| history
src/examples/ecore_pipe_simple_example.c		diff \| blob \| history
src/examples/ecore_poller_example.c		diff \| blob \| history
src/examples/ecore_server_bench.c		diff \| blob \| history
src/examples/ecore_thread_example.c		diff \| blob \| history
src/examples/ecore_time_functions_example.c		diff \| blob \| history
src/examples/ecore_timer_example.c		diff \| blob \| history
src/lib/ecore/Ecore.h		diff \| blob \| history
src/lib/ecore/ecore_exe.c		diff \| blob \| history
src/lib/ecore/ecore_timer.c		diff \| blob \| history
src/lib/ecore_con/ecore_con.c		diff \| blob \| history
src/lib/ecore_con/ecore_con_dns.c		diff \| blob \| history
src/lib/ecore_evas/Ecore_Evas.h		diff \| blob \| history
src/lib/ecore_evas/ecore_evas.c		diff \| blob \| history
src/lib/ecore_evas/ecore_evas_buffer.c		diff \| blob \| history
src/lib/ecore_evas/ecore_evas_cocoa.c		diff \| blob \| history
src/lib/ecore_evas/ecore_evas_directfb.c		diff \| blob \| history
src/lib/ecore_evas/ecore_evas_ews.c		diff \| blob \| history
src/lib/ecore_evas/ecore_evas_extn.c		diff \| blob \| history
src/lib/ecore_evas/ecore_evas_fb.c		diff \| blob \| history
src/lib/ecore_evas/ecore_evas_private.h		diff \| blob \| history
src/lib/ecore_evas/ecore_evas_psl1ght.c		diff \| blob \| history
src/lib/ecore_evas/ecore_evas_sdl.c		diff \| blob \| history
src/lib/ecore_evas/ecore_evas_wayland_egl.c		diff \| blob \| history
src/lib/ecore_evas/ecore_evas_wayland_shm.c		diff \| blob \| history
src/lib/ecore_evas/ecore_evas_win32.c		diff \| blob \| history
src/lib/ecore_evas/ecore_evas_wince.c		diff \| blob \| history
src/lib/ecore_evas/ecore_evas_x.c		diff \| blob \| history
src/lib/ecore_fb/ecore_fb.c		diff \| blob \| history
src/lib/ecore_fb/ecore_fb_kbd.c		diff \| blob \| history
src/lib/ecore_fb/ecore_fb_keytable.h		diff \| blob \| history
src/lib/ecore_fb/ecore_fb_li.c		diff \| blob \| history
src/lib/ecore_imf/Ecore_IMF.h		diff \| blob \| history
src/lib/ecore_imf/ecore_imf_context.c		diff \| blob \| history
src/lib/ecore_input/Ecore_Input.h		diff \| blob \| history
src/lib/ecore_input_evas/ecore_input_evas.c		diff \| blob \| history
src/lib/ecore_wayland/Ecore_Wayland.h		diff \| blob \| history
src/lib/ecore_wayland/ecore_wl.c		diff \| blob \| history
src/lib/ecore_wayland/ecore_wl_dnd.c		diff \| blob \| history
src/lib/ecore_wayland/ecore_wl_input.c		diff \| blob \| history
src/lib/ecore_wayland/ecore_wl_output.c		diff \| blob \| history
src/lib/ecore_wayland/ecore_wl_private.h		diff \| blob \| history
src/lib/ecore_wayland/ecore_wl_window.c		diff \| blob \| history
src/lib/ecore_x/Ecore_X.h		diff \| blob \| history
src/lib/ecore_x/xcb/ecore_xcb_atoms.c		diff \| blob \| history
src/lib/ecore_x/xcb/ecore_xcb_e.c		diff \| blob \| history
src/lib/ecore_x/xcb/ecore_xcb_events.c		diff \| blob \| history
src/lib/ecore_x/xlib/ecore_x_atoms.c		diff \| blob \| history
src/lib/ecore_x/xlib/ecore_x_e.c		diff \| blob \| history
src/lib/ecore_x/xlib/ecore_x_error.c		diff \| blob \| history
src/lib/ecore_x/xlib/ecore_x_events.c		diff \| blob \| history
src/modules/immodules/ibus/ibus_imcontext.c		diff \| blob \| history
src/modules/immodules/ibus/ibus_module.c		diff \| blob \| history
src/modules/immodules/scim/scim_imcontext.cpp		diff \| blob \| history
src/modules/immodules/scim/scim_module.cpp		diff \| blob \| history
src/modules/immodules/xim/ecore_imf_xim.c		diff \| blob \| history