git.openpandora.org / openembedded.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9eaf149 ce5b19f)
Merge commit 'origin/org.openembedded.dev' into holger/openmoko-merges
authorHolger Hans Peter Freyther <zecke@selfish.org>
Sun, 16 Nov 2008 15:35:39 +0000 (16:35 +0100)
committerHolger Hans Peter Freyther <zecke@selfish.org>
Sun, 16 Nov 2008 15:35:39 +0000 (16:35 +0100)
Conflicts:

packages/tasks/task-openmoko-feed.bb


Trivial merge
Clone of mainline OpenEmbedded repository