From: Mike McCormack <mj.mccormack@samsung.com>
Date: Thu, 11 Aug 2011 07:59:06 +0000 (+0900)
Subject: [Upstream migration @62307] Merge remote branch 'origin/upstream'
X-Git-Tag: accepted/2.0/20130306.224007~172^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44c860d65209ac5949c0b5afc433a8880b6707e7;p=profile%2Fivi%2Fecore.git

[Upstream migration @62307] Merge remote branch 'origin/upstream'

Conflicts:
	.gitignore
---

44c860d65209ac5949c0b5afc433a8880b6707e7
diff --cc .gitignore
index 5a69096,8c225d5..72b0619
--- a/.gitignore
+++ b/.gitignore
@@@ -80,29 -80,5 +80,31 @@@ Makefile.i
  /stamp-h1
  /doc/Doxyfile
  /src/bin/ecore_test
+ /src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h
+ /src/util/makekeys
 +debian/*.debhelper.log
 +debian/*.substvars
 +debian/*.debhelper
 +debian/libecore-bin/
 +config.guess.cdbs-orig
 +config.sub.cdbs-orig
 +debian/files
 +debian/libecore-con/
 +debian/libecore-config/
 +debian/libecore-data/
 +debian/libecore-dbg/
 +debian/libecore-dev/
 +debian/libecore-doc/
 +debian/libecore-evas/
 +debian/libecore-fb/
 +debian/libecore-file/
 +debian/libecore-imf/
 +debian/libecore-input/
 +debian/libecore-ipc/
 +debian/libecore-x/
 +debian/libecore/
 +debian/stamp-*
 +debian/tmp/
 +doc/html/
 +doc/latex/
 +doc/man/
diff --cc src/lib/ecore_evas/ecore_evas_x.c
index d3dcb58,1869b76..a66caad
mode 100755,100644..100755
--- a/src/lib/ecore_evas/ecore_evas_x.c
+++ b/src/lib/ecore_evas/ecore_evas_x.c
diff --cc src/lib/ecore_x/Ecore_X.h
index 630e11b,05f7e9f..a06136e
mode 100755,100644..100755
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h