Merge branch 'master' of git://git.code.sf.net/p/openpli/openpli-oe-core into bh...

[Open Black Hole Git]

Merge branch 'master' of git://git.code.sf.net/p/openpli/openpli-oe-core into bh-meta-vuplus

Conflicts:
meta-vuplus
meta-xtrend

• [DH] meta-openpli/recipes-openpli/enigma2-channelsettings/channelsettings-enigma2-meta.bb
• [DH] meta-openpli/recipes-openpli/enigma2-channelsettings/enigma2-plugin-settings-henksat-upc-regio-amsterdam.bb
• [DH] meta-openpli/recipes-openpli/enigma2-channelsettings/enigma2-plugin-settings-henksat-upc-regio-zevenaar.bb
• [DH] meta-openpli/recipes-openpli/enigma2-channelsettings/enigma2-plugin-settings-henksat-ziggo-1111.bb
• [DH] meta-openpli/recipes-openpli/enigma2-channelsettings/enigma2-plugin-settings-henksat-ziggo-5555.bb
• [DH] meta-openpli/recipes-openpli/enigma2-channelsettings/enigma2-plugin-settings-henksat-ziggo.bb
• [DH] meta-openpli/recipes-openpli/enigma2-channelsettings/henksat.inc
• [DH] meta-openpli/recipes-openpli/enigma2-softcams/enigma2-plugin-softcams-*****.bb

Author: dpeddi

Continue reading...