| commit | b75cb91f845d1871e159398c1315ece2119fee2d | |
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | |
| Wed, 10 Feb 2010 13:33:57 +0000 (10 14:33 +0100) | ||
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | |
| Wed, 10 Feb 2010 13:33:57 +0000 (10 14:33 +0100) | ||
| tree | a08dc27d8d6239414d26baefa4641d2e13d65d9f | treesnapshot (tar.gz zip) |
| parent | 8448a620e252208acbed9d4c6776c86d34186d99 | commitdiff |
| parent | 6224275aa357ed61282253d9a1a1eddf432ceef1 | commitdiff |
Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev
Conflicts:
conf/checksums.ini
Conflicts:
conf/checksums.ini
| conf/checksums.ini | diff1 | diff2 | blobhistory |