projects / vuplus_openembedded / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d6a84b4 207c5c8)
Merge branch 'org.openembedded.dreambox' of git://git.opendreambox.org/git/obi/opendr...
authorFelix Domke <tmbinc@elitedvb.net>
Tue, 25 Nov 2008 22:27:19 +0000 (23:27 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Tue, 25 Nov 2008 22:27:19 +0000 (23:27 +0100)
commit7e7c6df5b883c3993bababa7eddad6aeabfc7e23
tree753e28ea5592f1c38d6ef982561e655e289a5ab5tree | snapshot
parentd6a84b4b97e90a053ff63b6f182bf513382ef6f2commit | diff
parent207c5c8fe004bd262ba2fc3361199419e13d9e2fcommit | diff
Merge branch 'org.openembedded.dreambox' of git://git.opendreambox.org/git/obi/opendreambox-1.5 into org.openembedded.dreambox

Conflicts:

packages/base-files/base-files_3.0.14.bb
packages/base-files/base-files_3.0.14.bb diff1 | diff2 | blob | history
openembedded 1.6 repository.