projects
/
vuplus_openvuplus_3.0
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4e75626
b27e9c9
)
Merge branch 'vuplus-3.0-next' into vuplus-3.0
author
hschang
<chang@dev3>
Mon, 11 May 2015 04:00:18 +0000
(13:00 +0900)
committer
hschang
<chang@dev3>
Mon, 11 May 2015 04:00:18 +0000
(13:00 +0900)
Conflicts:
meta-openvuplus/recipes-multimedia/gstreamer/gstreamer1.0-plugin-dvbmediasink.bb
meta-openvuplus/recipes-multimedia/gstreamer1.0/gstreamer1.0-plugin-dvbmediasink.bbappend
meta-openvuplus/recipes-multimedia/gstreamer1.0/gstreamer1.0-plugin-dvbmediasink/gstreamer10_dvbmediasink_vuplus.patch
Trivial merge
projects / vuplus_openvuplus_3.0 / commitdiff