git.openpandora.org / openembedded.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0fcc31 f5d9625)
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.net/openembedde...
authorHolger Hans Peter Freyther <zecke@selfish.org>
Mon, 3 Nov 2008 15:35:01 +0000 (16:35 +0100)
committerHolger Hans Peter Freyther <zecke@selfish.org>
Mon, 3 Nov 2008 15:35:01 +0000 (16:35 +0100)
Conflicts:

packages/images/fso-image.bb

1  2 
packages/images/fso-image.bb patch | diff1 | diff2 | blob | history

diff --cc packages/images/fso-image.bb
Simple merge
Clone of mainline OpenEmbedded repository