EFL migration revision 67695
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 14 Feb 2012 08:54:53 +0000 (17:54 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 15 Feb 2012 07:03:12 +0000 (16:03 +0900)
commitb803fe7e92657861e54eafd40ca848d8022b9d00
tree46cbfb374603f1558e878b50f59379e3686493a9
parent2a61b31d2b173f9540cbc9acfe0d0e46bf8845c1
parenta9f5899bb8fe6cb2fbfc69f16a4a5401c661ae14
EFL migration revision 67695
Merge remote branch 'origin/upstream'

Conflicts:
src/lib/ecore_imf/ecore_imf_context.c
src/modules/immodules/scim/scim_imcontext.cpp
src/lib/ecore/ecore_thread.c
src/lib/ecore_con/Ecore_Con.h
src/lib/ecore_evas/ecore_evas_private.h
src/lib/ecore_imf/ecore_imf_context.c
src/lib/ecore_x/Ecore_X.h