Merge remote-tracking branch 'origin/upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Thu, 3 Nov 2011 01:52:42 +0000 (10:52 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Thu, 3 Nov 2011 01:59:35 +0000 (10:59 +0900)
commit7ef12f1dd7c5b4fb40fa1a62c9fdeebe3743285f
tree032ee0b7e2c972672a42469a2ee5e51e3081f38f
parent7713323ecf4cc26d6420668d4eb298b0346cfe6c
parent7ccdf5cfdae65e8d9f7430a5d81bc3f8f59b19da
Merge remote-tracking branch 'origin/upstream'

Conflicts:
po/cs.po
src/lib/ecore_evas/Ecore_Evas.h
src/lib/ecore_evas/ecore_evas_util.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
17 files changed:
po/cs.po
po/de.po
po/el.po
po/fr.po
po/it.po
po/nl.po
po/pt.po
po/sl.po
src/lib/ecore/ecore_thread.c
src/lib/ecore_con/ecore_con_url.c
src/lib/ecore_evas/ecore_evas_private.h
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