git.openpandora.org / openembedded.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitf0573933b8de671b98e3d5377774c6a3e671fc84
tree10d157bc9803d165bbed7380c806a759a32d5a78tree | snapshot
parentc0fcc31726c8c0ae90657512bd95bc983d1a8e4bcommit | diff
parentf5d962579bbe4add4dad10664e73e7c43209a1c5commit | diff
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.net/openembedded into org.openembedded.dev

Conflicts:

packages/images/fso-image.bb
packages/images/fso-image.bb diff1 | diff2 | blob | history
Clone of mainline OpenEmbedded repository