projects
/
vuplus_openembedded
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9b7ecce
7e73c54
)
Merge branch 'vuplus-1.6' of ssh://192.168.102.66/~ikseong/work/repo/openembedded...
author
schon
<schon@dev03-server>
Tue, 12 Oct 2010 06:10:25 +0000
(15:10 +0900)
committer
schon
<schon@dev03-server>
Tue, 12 Oct 2010 06:10:25 +0000
(15:10 +0900)
Conflicts:
conf/distro/vuplus.conf
recipes/vuplus/vuplus-dvb-modules.bb
Trivial merge