Merge branch 'master' of https://github.com/OpenPLi/openpli-oe-core

[Open Black Hole Git]

Merge branch 'master' of https://github.com/OpenPLi/openpli-oe-core

Conflicts:
meta-vuplus
meta-xtrend

• [DH] meta-dream/conf/machine/dm800se.conf
• [DH] meta-openpli/recipes-multimedia/aio-grab/aio-grab.bb
• [DH] meta-openpli/recipes-multimedia/tuxbox/tuxbox-common.bb
• [DH] meta-openpli/recipes-openpli/enigma2-channelsettings/henksat.inc
• [DH] meta-openpli/recipes-openpli/enigma2/enigma2.bb
• [DH] meta-openpli/recipes-openpli/enigma2/gst-plugin-subsink.bb
• [DH] meta-openpli/recipes-openpli/images/openpli-enigma2-image.bb
• [DH] meta-openpli/recipes-openpli/streamproxy/streamproxy.bb

Author: meo

Continue reading...