Merge branch 'upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Wed, 27 Jul 2011 04:11:20 +0000 (13:11 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Wed, 27 Jul 2011 04:11:20 +0000 (13:11 +0900)
commit694c0d0590daf8ef5db8159c39d1471679569d9e
tree03b77d1e72473d8d2725c0cc9c23c4da6af8de94
parenta9e0d4c920bced333365f7bc5c62384cc58fe988
parent2c40bda91365b671dd3ec2905ed87c35198083ed
Merge branch 'upstream'

Conflicts:
.gitignore
src/lib/ecore_evas/ecore_evas_x.c
.gitignore
ecore.spec.in
src/lib/ecore/ecore_thread.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