projects / framework / uifw / elementary.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f6c8508) | patch
Fix merge conflict.
authorsanjeev <sanjeev@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Fri, 4 Nov 2011 12:12:16 +0000 (12:12 +0000)
committersanjeev <sanjeev@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Fri, 4 Nov 2011 12:12:16 +0000 (12:12 +0000)
commit27ea85033c639b7e14c719e6e757edcc6bcfdbeb
tree19ae25e14eafafead5545a4549dc405b70564fdctree | snapshot
parentf6c8508de0da877427ef741f95f00205227e4f77commit | diff
Fix merge conflict.

Signed-off-by: Sanjeev BA <as2902.b@samsung.com>
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@64723 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
AUTHORS diff | blob | history
Domain: UI Framework / Uncategorized;