[oe-commits] Martin Jansa : Merge remote branch 'origin/org.openembedded.dev' into shr/ merge
git version control
git at git.openembedded.org
Wed Nov 11 18:36:46 UTC 2009
Module: openembedded.git
Branch: shr/merge
Commit: 24b8377d54756c8b64b1c7e15127642174b6669f
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=24b8377d54756c8b64b1c7e15127642174b6669f
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Wed Nov 11 19:35:47 2009 +0100
Merge remote branch 'origin/org.openembedded.dev' into shr/merge
Conflicts:
conf/distro/include/sane-srcrevs-fso.inc
conf/distro/include/sane-srcrevs.inc
---
More information about the Openembedded-commits
mailing list