Merge branch 'vuplus-3.0-next' into vuplus-3.0
authorhschang <chang@dev3>
Mon, 11 May 2015 04:00:18 +0000 (13:00 +0900)
committerhschang <chang@dev3>
Mon, 11 May 2015 04:00:18 +0000 (13:00 +0900)
commitd37927f748f79bf085dbca2aa0b781bf9833d56e
tree09bff0247fd8f713b52b5183ef109a2f0c4a86ed
parent4e75626197dab638fab963c486c979e329f917ae
parentb27e9c967f00e7b65f8e904c8caa774eecb371ba
Merge branch 'vuplus-3.0-next' into vuplus-3.0

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