projects / vuplus_openembedded / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 292348b f6d6fe2)
Merge branch 'vuplus-1.6' of ssh://192.168.102.66/~ikseong/work/repo/openembedded...
authorschon <schon@dev03-server>
Mon, 19 Jul 2010 06:49:32 +0000 (15:49 +0900)
committerschon <schon@dev03-server>
Mon, 19 Jul 2010 06:49:32 +0000 (15:49 +0900)
commitdd83ba60c962e25950a1673ee845d7e6a00d3c29
tree0e0b0f9676d296846eb3c1af01b050c75bb7e6cdtree | snapshot
parent292348bc0cdd3c80c5b5407d53c842a7bd28d591commit | diff
parentf6d6fe2fa58feee866e6b2639d82cfcad5d89fd5commit | diff
Merge branch 'vuplus-1.6' of ssh://192.168.102.66/~ikseong/work/repo/openembedded into vuplus-1.6

Conflicts:
recipes/vuplus/vuplus-dvb-modules.bb
recipes/vuplus/vuplus-dvb-modules.bb diff1 | diff2 | blob | history
openembedded 1.6 repository.