ecore: fix git merge damage
authorKoen Kooi <koen@openembedded.org>
Sat, 25 Apr 2009 07:40:53 +0000 (09:40 +0200)
committerKoen Kooi <koen@openembedded.org>
Sat, 25 Apr 2009 07:40:53 +0000 (09:40 +0200)
commit9b4e61a4477f989075595660dc4737fb77b8b11f
treed3c76435e724ec4a5e8a6a3ab6f4e870f0834f49
parent46c34116ecaefae4baf3a1ff4d726f40551fe5e3
ecore: fix git merge damage
recipes/efl1/ecore.inc
recipes/efl1/ecore_svn.bb