projects / vuplus_openembedded / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf27571 3c12e38)
Merge commit 'dm/opendreambox-1.6' into test branch
authorschon <schon@dev03-server>
Wed, 25 May 2011 07:37:16 +0000 (16:37 +0900)
committerschon <schon@dev03-server>
Wed, 25 May 2011 07:37:16 +0000 (16:37 +0900)
Conflicts:
recipes/enigma2/enigma2-drivers-meta_1.0.bb


Trivial merge
openembedded 1.6 repository.