Ecore migration revision 70444
authorMyungjae Lee <mjae.lee@samsung.com>
Wed, 25 Apr 2012 04:50:56 +0000 (13:50 +0900)
committerMyungjae Lee <mjae.lee@samsung.com>
Wed, 25 Apr 2012 04:51:30 +0000 (13:51 +0900)
Merge remote-tracking branch 'remotes/origin/upstream'

1  2 
ChangeLog
NEWS
po/cs.po
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

diff --cc ChangeLog
Simple merge
diff --cc NEWS
Simple merge
diff --cc po/cs.po
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge