Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
authorhschang <chang@dev3>
Fri, 21 Nov 2014 05:08:01 +0000 (14:08 +0900)
committerhschang <chang@dev3>
Fri, 21 Nov 2014 05:08:01 +0000 (14:08 +0900)
commit89fe5e2d4ab32d17585aaf80418c7d31ed559a14
treec0b6470d555f1ec36ec54aeca7ce3bd48a73e71f
parentd79918a4bef758142074ba69a93edf029ab3cdf7
parent6907ca5bf3e3580f17748e8c7cf2ff218c0e613c
Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0

Conflicts:
meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb
meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot.bb