Merge branch 'elmdnd'
authornash <nash@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Tue, 7 Sep 2010 06:56:16 +0000 (06:56 +0000)
committernash <nash@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Tue, 7 Sep 2010 06:56:16 +0000 (06:56 +0000)
commit8a8b53fa235a6ed5181551fee76c55741c650391
treea239e562a49ddfd4b6d7018f84b005409271df29
parent5dcb46b73576f24444a9e3468fdd4246aa4f8e15
Merge branch 'elmdnd'

Conflicts:
trunk/TMP/st/elementary/.gitignore

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@51935 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
src/lib/ecore_x/xlib/ecore_x_drawable.c
src/lib/ecore_x/xlib/ecore_x_selection.c
src/lib/ecore_x/xlib/ecore_x_window.c