projects / vuplus_openembedded / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3779ed 8c5d992)
Merge branch 'vuplus-1.6' of code.vuplus.com:/opt/repository/openembedded into kernel31
authorschon <schon@dev03-server>
Fri, 25 Nov 2011 09:40:02 +0000 (18:40 +0900)
committerschon <schon@dev03-server>
Fri, 25 Nov 2011 09:40:02 +0000 (18:40 +0900)
Conflicts:
conf/machine/vuultimo.conf
recipes/vuplus/vuplus-dvb-modules.bb

1  2 
conf/machine/vuultimo.conf patch | diff1 | diff2 | blob | history
recipes/tasks/task-vuplus-enigma2.bb patch | diff1 | diff2 | blob | history

diff --cc conf/machine/vuultimo.conf
Simple merge
diff --cc recipes/tasks/task-vuplus-enigma2.bb
Simple merge
openembedded 1.6 repository.