From: hschang <chang@dev3>
Date: Mon, 11 May 2015 04:00:18 +0000 (+0900)
Subject: Merge branch 'vuplus-3.0-next' into vuplus-3.0
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=d37927f748f79bf085dbca2aa0b781bf9833d56e

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
---

d37927f748f79bf085dbca2aa0b781bf9833d56e