Merge remote-tracking branch 'origin/upstream'
authorJeonghyun Yun <jh0506.yun@samsung.com>
Wed, 29 Feb 2012 06:59:22 +0000 (01:59 -0500)
committerJeonghyun Yun <jh0506.yun@samsung.com>
Wed, 29 Feb 2012 06:59:22 +0000 (01:59 -0500)
commit43c057218caf8d48bf4f18d80b0a0d3f2674211f
treef63f9ac178082655ffc0ed33119308fd7e1ee838
parent23b3d6f7daea72d868e640339b5a372094cb8965
parent331d188825806dc4f1b54dd97fce9070d30ee9c5
Merge remote-tracking branch 'origin/upstream'

Conflicts:
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/xlib/ecore_x_e.c
12 files changed:
src/lib/ecore/ecore_thread.c
src/lib/ecore_con/ecore_con_url.c
src/lib/ecore_evas/ecore_evas_buffer.c
src/lib/ecore_evas/ecore_evas_private.h
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/xlib/ecore_x_atoms.c
src/lib/ecore_x/xlib/ecore_x_e.c