projects
/
vuplus_openembedded
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
292348b
f6d6fe2
)
Merge branch 'vuplus-1.6' of ssh://192.168.102.66/~ikseong/work/repo/openembedded...
author
schon
<schon@dev03-server>
Mon, 19 Jul 2010 06:49:32 +0000
(15:49 +0900)
committer
schon
<schon@dev03-server>
Mon, 19 Jul 2010 06:49:32 +0000
(15:49 +0900)
Conflicts:
recipes/vuplus/vuplus-dvb-modules.bb
1
2
recipes/vuplus/vuplus-dvb-modules.bb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
recipes/vuplus/vuplus-dvb-modules.bb
Simple merge