Merge branch 'vuplus-1.6k_dev' into vuplus-1.6k

Status
Not open for further replies.
VuPlus Git

VuPlus Git

Vu+ Newbie
Merge branch 'vuplus-1.6k_dev' into vuplus-1.6k

Conflicts:
recipes/enigma2/enigma2.bb
recipes/opera-hbbtv/opera-hbbtv_0.1.bb

  • [DH] conf/machine/include/vuplus-modules2.inc
  • [DH] conf/machine/include/vuplus-modules_2.6.37.inc
  • [DH] conf/machine/vuduo2.conf
  • [DH] conf/machine/vusolo2.conf
  • [DH] recipes/aio-grab/aio-grab.bb
  • [DH] recipes/aio-grab/aio-grab/aio-grab_vuplus.patch
  • [DH] recipes/base-files/base-files/vu7425/fstab
  • [DH] recipes/base-files/base-files/vu7425/fstab_3.1
  • [DH] recipes/base-files/base-files/vuduo2/fstab
  • [DH] recipes/base-files/base-files/vuduo2/fstab_3.1
  • [DH] recipes/base-files/base-files/vusolo2/fstab
  • [DH] recipes/base-files/base-files/vusolo2/fstab_3.1
  • [DH] recipes/directfb/directfb.inc
  • [DH] recipes/duo2lcd4linux/duo2lcd4linux_0.1.bb
  • [DH] recipes/duo2lcd4linux/files/LCD4linux.tar.gz
  • [DH] recipes/enigma2/enigma2-plugin-systemplugins-adsm.bb
  • [DH] recipes/enigma2/enigma2-plugins.bb
  • [DH] recipes/enigma2/enigma2.bb
  • [DH] recipes/enigma2/enigma2/vuplus/enigma2_vuplus_1080p.patch
  • [DH] recipes/images/vuplus-image.bb
  • [DH] recipes/initscripts/initscripts-1.0/vuduo2/bootup
  • [DH] recipes/initscripts/initscripts-1.0/vuduo2/bootup_3.1
  • [DH] recipes/initscripts/initscripts-1.0/vuduo2/halt
  • [DH] recipes/initscripts/initscripts-1.0/vuduo2/hotplug_br
  • [DH] recipes/initscripts/initscripts-1.0/vuduo2/make_mac_sector
  • [DH] recipes/initscripts/initscripts-1.0/vusolo2/bootup
  • [DH] recipes/initscripts/initscripts-1.0/vusolo2/bootup_3.1
  • [DH] recipes/initscripts/initscripts-1.0/vusolo2/halt
  • [DH] recipes/initscripts/initscripts-1.0/vusolo2/hotplug_br
  • [DH] recipes/initscripts/initscripts-1.0/vusolo2/make_mac_sector
  • [DH] recipes/initscripts/initscripts-vuplus_1.0.bb
  • [DH] recipes/libdreamdvd/libdreamdvd.bb
  • [DH] recipes/linux-libc-headers/linux-libc-headers-2.6.31/dvbapi-5.5.patch
  • [DH] recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
  • [DH] recipes/linux/linux-vuduo2-2.6.37/bcmgenet_oobctrl.patch
  • [DH] recipes/linux/linux-vuduo2-2.6.37/brcm_disable_enet1.patch
  • [DH] recipes/linux/linux-vuduo2-2.6.37/brcm_mtd_mac.patch
  • [DH] recipes/linux/linux-vuduo2-2.6.37/dvb-core.patch
  • [DH] recipes/linux/linux-vuduo2-2.6.37/fix_cpu_proc.patch
  • [DH] recipes/linux/linux-vuduo2-2.6.37/pinmux.patch
  • [DH] recipes/linux/linux-vuduo2-2.6.37/serial.patch
  • [DH] recipes/linux/linux-vuduo2-2.6.37/vuduo2_defconfig
  • [DH] recipes/linux/linux-vuduo2-3.3.6/brcm_3.3.patch
  • [DH] recipes/linux/linux-vuduo2-3.3.6/brcm_mtd_mac.patch
  • [DH] recipes/linux/linux-vuduo2-3.3.6/dvb_core_5.5.patch
  • [DH] recipes/linux/linux-vuduo2-3.3.6/fix_cpu_proc.patch
  • [DH] recipes/linux/linux-vuduo2-3.3.6/vuduo2_defconfig
  • [DH] recipes/linux/linux-vuduo2_2.6.37.bb
  • [DH] recipes/linux/linux-vuduo2_3.3.6.bb
  • [DH] recipes/linux/linux-vuplus-3.3.6.inc
  • [DH] recipes/linux/linux-vusolo2-2.6.37/bcmgenet_oobctrl.patch
  • [DH] recipes/linux/linux-vusolo2-2.6.37/brcm_disable_enet1.patch
  • [DH] recipes/linux/linux-vusolo2-2.6.37/brcm_mtd_mac.patch
  • [DH] recipes/linux/linux-vusolo2-2.6.37/debug.patch
  • [DH] recipes/linux/linux-vusolo2-2.6.37/dvb-core.patch
  • [DH] recipes/linux/linux-vusolo2-2.6.37/fix_cpu_proc.patch
  • [DH] recipes/linux/linux-vusolo2-2.6.37/pinmux.patch
  • [DH] recipes/linux/linux-vusolo2-2.6.37/ubifs_packport.patch
  • [DH] recipes/linux/linux-vusolo2-2.6.37/vusolo2_defconfig
  • [DH] recipes/linux/linux-vusolo2-3.3.6/brcm_3.3.patch
  • [DH] recipes/linux/linux-vusolo2-3.3.6/brcm_mtd_mac.patch
  • [DH] recipes/linux/linux-vusolo2-3.3.6/dvb_core_5.5.patch
  • [DH] recipes/linux/linux-vusolo2-3.3.6/fix_cpu_proc.patch
  • [DH] recipes/linux/linux-vusolo2-3.3.6/vusolo2_defconfig
  • [DH] recipes/linux/linux-vusolo2_2.6.37.bb
  • [DH] recipes/linux/linux-vusolo2_3.3.6.bb
  • [DH] recipes/module-init-tools/module-init-tools-cross_3.2.2.bb
  • [DH] recipes/opera-hbbtv/opera-hbbtv_0.1.bb
  • [DH] recipes/opkg/opkg-collateral/vuduo2/dest
  • [DH] recipes/opkg/opkg-collateral/vusolo2/dest
  • [DH] recipes/png-util/files/png_util.cpp
  • [DH] recipes/png-util/files/png_util.h
  • [DH] recipes/png-util/files/png_util.i
  • [DH] recipes/png-util/png-util_1.0.bb
  • [DH] recipes/sysvinit/sysvinit/vuduo2/inittab
  • [DH] recipes/sysvinit/sysvinit/vusolo2/inittab
  • [DH] recipes/tasks/task-vuplus-base.bb
  • [DH] recipes/tasks/task-vuplus-enigma2.bb
  • [DH] recipes/tasks/task-vuplus-wlan.bb
  • [DH] recipes/tuxbox/libdvbsi++.bb
  • [DH] recipes/tuxbox/tuxbox-libtuxtxt.bb
  • [DH] recipes/udev/udev_124.bb
  • [DH] recipes/vuplus/vuplus-bootlogo.bb
  • [DH] recipes/vuplus/vuplus-bootlogo/vuduo2/initrd_cfe_auto.bin
  • [DH] recipes/vuplus/vuplus-bootlogo/vuduo2/splash_cfe_auto.bin
  • [DH] recipes/vuplus/vuplus-bootlogo/vusolo2/initrd_cfe_auto.bin
  • [DH] recipes/vuplus/vuplus-bootlogo/vusolo2/splash_cfe_auto.bin
  • [DH] recipes/vuplus/vuplus-dvb-modules.bb
  • [DH] recipes/vuplus/vuplus-manual.bb

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