Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
authorhschang <chang@dev3>
Fri, 18 Jul 2014 05:00:52 +0000 (14:00 +0900)
committerhschang <chang@dev3>
Fri, 18 Jul 2014 05:00:52 +0000 (14:00 +0900)
commit8205d55cd1f4f813c303e01e8bf54b5aa45ce915
tree4adbc90908e55fd24eaccdf22420986da75e7059
parent735cc71cb1eef9d3ff532cc586dbde959c48bbbb
parent3a8416b9628b940abaa6d8c4c825c1617cc3f42f
Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0

Conflicts:
meta-openvuplus/recipes-core/tasks/task-core-boot.inc
meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
Makefile
meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb
meta-openvuplus/recipes-core/packagegroup/packagegroup-core-boot.bbappend
meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.1.bb
meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb