Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
authorhschang <chang@dev3>
Thu, 7 Aug 2014 01:17:28 +0000 (10:17 +0900)
committerhschang <chang@dev3>
Thu, 7 Aug 2014 01:17:28 +0000 (10:17 +0900)
commitd79918a4bef758142074ba69a93edf029ab3cdf7
treef9ec71e0245c4bc2139617b246858ba9820daa96
parent4823f06f806b17d9713d364898767c6869485358
parent60b9ae325d7423e7ccc2c6a49495a812c27bc275
Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0

Conflicts:
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb