summaryrefslogtreecommitdiffstats
path: root/recipes/images
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-04-25 09:40:53 +0200
committerKoen Kooi <koen@openembedded.org>2009-04-25 09:40:53 +0200
commit9b4e61a4477f989075595660dc4737fb77b8b11f (patch)
treed3c76435e724ec4a5e8a6a3ab6f4e870f0834f49 /recipes/images
parent46c34116ecaefae4baf3a1ff4d726f40551fe5e3 (diff)
downloadopenembedded-9b4e61a4477f989075595660dc4737fb77b8b11f.tar.gz
ecore: fix git merge damage
Diffstat (limited to 'recipes/images')
0 files changed, 0 insertions, 0 deletions