Merge remote-tracking branch 'oe_21/master' into vuplus-3.0
authorhschang <chang@dev3>
Tue, 17 Mar 2015 09:29:46 +0000 (18:29 +0900)
committerhschang <chang@dev3>
Tue, 17 Mar 2015 09:29:46 +0000 (18:29 +0900)
commit62c6cf38a4fc3b98419de1d11e50320c2acfd453
treecb3bfd790da1014ce50df2c13d12fdeef77c0f48
parent7d88dacb383779dc332994dae0fee0beb002dcac
parent2069ebf423d4a061a5bb67a3a938a92e4e3fc1f4
Merge remote-tracking branch 'oe_21/master' into vuplus-3.0

Conflicts:
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-proxy.bbappend
meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-proxy.bbappend
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb