Upstream merge
authorJiyoun Park <jy0703.park@samsung.com>
Wed, 20 Jun 2012 08:20:07 +0000 (17:20 +0900)
committerJiyoun Park <jy0703.park@samsung.com>
Wed, 20 Jun 2012 08:20:07 +0000 (17:20 +0900)
commitfd1621ca03ea335f8a5bf0a08c37923836f68b8d
tree7782cfa168b6cc3c20729992b8d840e7c4822eae
parentc8860c078c350417bfe9254689a468ed5ac0c5e9
parente2a66b307cfc9ce93e2e21d63fd818d0ea7f3341
Upstream merge
Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
ChangeLog
NEWS
src/lib/ecore/ecore_thread.c
src/lib/ecore_evas/ecore_evas_wayland_shm.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/xlib/ecore_x_atoms.c

Change-Id: I1061e8307ecaf505c897d7279ca0eac4daacd2e4
20 files changed:
ChangeLog
NEWS
packaging/ecore.spec
po/cs.po
src/lib/ecore_evas/Ecore_Evas.h
src/lib/ecore_evas/ecore_evas.c
src/lib/ecore_evas/ecore_evas_directfb.c
src/lib/ecore_evas/ecore_evas_fb.c
src/lib/ecore_evas/ecore_evas_wayland_egl.c
src/lib/ecore_evas/ecore_evas_wayland_shm.c
src/lib/ecore_evas/ecore_evas_win32.c
src/lib/ecore_evas/ecore_evas_x.c
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
src/lib/ecore_x/xlib/ecore_x_e.c