EFL core migration revision 69115
authorJeonghyun Yun <jh0506.yun@samsung.com>
Sat, 10 Mar 2012 04:08:25 +0000 (13:08 +0900)
committerJeonghyun Yun <jh0506.yun@samsung.com>
Sat, 10 Mar 2012 04:09:14 +0000 (13:09 +0900)
commit217dd06ed9cd53feb727b7c8f5733879105ba1c0
tree9dfbd936b86cab0c286941f1384159f0309cc210
parentbfe7ae8adf05f25a84f6ef60a8a2b399a74e5291
parent9611075d01671832ef1b5a08f25c548c7dab0d78
EFL core migration revision 69115
Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
src/lib/ecore_evas/ecore_evas_x.c
src/lib/ecore_x/xlib/ecore_x_e.c
po/cs.po
src/lib/ecore/ecore_thread.c
src/lib/ecore_con/ecore_con_url.c
src/lib/ecore_evas/ecore_evas_x.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