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

Status
Not open for further replies.
O

Open Black Hole Git

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

Conflicts:
Makefile
meta-hd
meta-xtrend

  • [DH] .gitmodules
  • [DH] Makefile
  • [DH] meta-dream/recipes-bsp/drivers/dreambox-boot-progress.bb
  • [DH] meta-hd
  • [DH] meta-openpli/conf/layer.conf
  • [DH] meta-openpli/recipes-connectivity/rtorrent/libtorrent_0.13.2.bb
  • [DH] meta-openpli/recipes-connectivity/rtorrent/rtorrent_0.9.2.bb
  • [DH] meta-openpli/recipes-core/busybox/busybox/mdev-mount.sh
  • [DH] meta-openpli/recipes-core/busybox/busybox/mdev.conf
  • [DH] meta-openpli/recipes-devtools/python/python-wifi_0.5.0.bb
  • [DH] meta-openpli/recipes-multimedia/cdfs/cdfs_2.6.27.bb
  • [DH] meta-openpli/recipes-multimedia/cdfs/files/add-4.2-support.patch
  • [DH] meta-openpli/recipes-multimedia/tuxtxt/libtuxtxt.bb
  • [DH] meta-openpli/recipes-multimedia/tuxtxt/tuxtxt-enigma2.bb
  • [DH] meta-openpli/recipes-openpli/enigma2-channelsettings/hans.inc
  • [DH] meta-openpli/recipes-openpli/enigma2-channelsettings/henksat.inc
  • [DH] meta-openpli/recipes-openpli/enigma2-channelsettings/icesat.inc
  • [DH] meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugin-extensions-openwebif.bbappend
  • [DH] meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugin-extensions-xmltvimport-rytec.bb
  • [DH] meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugin-extensions-xmltvimport.bb
  • [DH] meta-openpli/recipes-openpli/enigma2-plugins/enigma2-plugins.bb
  • [DH] meta-openpli/recipes-openpli/enigma2-softcams/enigma2-plugin-softcams-*****.bb
  • [DH] meta-openpli/recipes-openpli/enigma2-softcams/enigma2-plugin-softcams-*****/*****.conf
  • [DH] meta-openpli/recipes-openpli/enigma2-softcams/enigma2-plugin-softcams-*****/*****.server
  • [DH] meta-openpli/recipes-openpli/enigma2-softcams/enigma2-plugin-softcams-*****/*****.user
  • [DH] meta-openpli/recipes-openpli/enigma2/enigma2.bb
  • [DH] meta-openpli/recipes-openpli/enigma2/hotplug-e2-helper.bb
  • [DH] meta-openpli/recipes-openpli/enigma2/settings-autorestore.bb
  • [DH] meta-openpli/recipes-openpli/enigma2/settings-autorestore/autoinstall.sh
  • [DH] meta-openpli/recipes-openpli/fakelocale/files/lctimelocales.tar.gz
  • [DH] meta-openpli/recipes-openpli/images/openpli-enigma2-feed.bb
  • [DH] meta-openpli/recipes-openpli/satip/minisatip.bb
  • [DH] meta-openpli/recipes-openpli/satip/satipclient.bb
  • [DH] meta-openpli/recipes-openpli/streamproxy/streamproxy.bb
  • [DH] meta-xsarius
  • [DH] meta-xtrend
Author: meo

Continue reading...
 
Status
Not open for further replies.
Top