Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus

[VuPlus Git]

Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus

Conflicts:
meta-bsp/vuduo2/conf/machine/vuduo2.conf
meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc

• [DH] meta-bsp/vuduo2/conf/machine/vuduo2.conf
• [DH] meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.1.bb
• [DH] meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
• [DH] meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb
• [DH] meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
• [DH] meta-openvuplus/recipes-vuplus/tasks/task-vuplus-essential.bb

Continue reading...