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

[VuPlus Git]

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

Conflicts:
meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend

• [DH] meta-bsp/bm750/conf/machine/bm750.conf
• [DH] meta-bsp/bm750/recipes/vuplus/vuplus-dvb-modules.bbappend
• [DH] meta-bsp/vuduo2/conf/machine/vuduo2.conf
• [DH] meta-bsp/vusolo/conf/machine/vusolo.conf
• [DH] meta-bsp/vusolo/recipes/vuplus/vuplus-dvb-modules.bbappend
• [DH] meta-bsp/vusolo2/conf/machine/vusolo2.conf
• [DH] meta-bsp/vusolo2/recipes/vuplus/vuplus-dvb-modules.bbappend
• [DH] meta-bsp/vuultimo/conf/machine/vuultimo.conf
• [DH] meta-bsp/vuultimo/recipes/vuplus/vuplus-dvb-modules.bbappend
• [DH] meta-bsp/vuuno/conf/machine/vuuno.conf
• [DH] meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend
• [DH] meta-openvuplus/recipes-connectivity/samba/samba/smb.conf
• [DH] meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bbappend
• [DH] meta-openvuplus/recipes-core/busybox/busybox-1.19.4/defconfig
• [DH] meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend
• [DH] meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend
• [DH] meta-openvuplus/recipes-extended/ethtool/ethtool/vuplus.patch
• [DH] meta-openvuplus/recipes-extended/ethtool/ethtool_2.6.36.bbappend
• [DH] meta-openvuplus/recipes-multimedia/dvbtools/dvb-apps-1.1.1/update-to-tip.diff
• [DH] meta-openvuplus/recipes-multimedia/dvbtools/dvb-apps-1.1.1/update-to-trunk.diff
• [DH] meta-openvuplus/recipes-multimedia/dvbtools/dvb-apps_1.1.1.bb
• [DH] meta-openvuplus/recipes-multimedia/dvbtools/dvbstream_cvs.bb
• [DH] meta-openvuplus/recipes-multimedia/dvbtools/dvbtune_cvs.bb
• [DH] meta-openvuplus/recipes-multimedia/dvbtools/wscan_20101204.bb
• [DH] meta-openvuplus/recipes-vuplus/dreambox-dvbincludes/dreambox-dvbincludes.bb
• [DH] meta-openvuplus/recipes-vuplus/dreambox-dvbincludes/dreambox-dvbincludes_1.1.bb
• [DH] meta-openvuplus/recipes-vuplus/dvbsnoop/dvbsnoop.bb
• [DH] meta-openvuplus/recipes-vuplus/dvbsnoop/files/acinclude.m4
• [DH] meta-openvuplus/recipes-vuplus/dvbtraffic/dvbtraffic.bb
• [DH] meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
• [DH] meta-openvuplus/recipes-vuplus/images/vuplus-image.inc
• [DH] meta-openvuplus/recipes-vuplus/sctzap/sctzap_cvs.bb
• [DH] meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc
• [DH] meta-openvuplus/recipes-vuplus/tasks/task-vuplus-dvbapi3.bb
• [DH] meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
• [DH] meta-openvuplus/recipes-vuplus/tasks/task-vuplus-essential.bb
• [DH] meta-openvuplus/recipes-vuplus/tuxcom/tuxbox-tuxcom-32bpp.bb
• [DH] meta-openvuplus/recipes-vuplus/tuxcom/tuxbox-tuxcom-32bpp/32bpp.diff
• [DH] meta-openvuplus/recipes-vuplus/tuxcom/tuxbox-tuxcom-32bpp/add_e2_plugin.diff
• [DH] meta-openvuplus/recipes-vuplus/tuxcom/tuxbox-tuxcom-32bpp/add_font.diff
• [DH] meta-openvuplus/recipes-vuplus/tuxcom/tuxbox-tuxcom-32bpp/fix_smstext.diff
• [DH] meta-openvuplus/recipes-vuplus/tuxcom/tuxbox-tuxcom-32bpp/largefile.diff
• [DH] meta-openvuplus/recipes-vuplus/tuxcom/tuxbox-tuxcom-32bpp/makefiles.diff
• [DH] meta-openvuplus/recipes-vuplus/tuxcom/tuxbox-tuxcom-32bpp/support_newer_freetype.diff
• [DH] meta-openvuplus/recipes-vuplus/vuplus-fpga-update/vuplus-fpga-update.bb
• [DH] meta-openvuplus/recipes-vuplus/vuplus-fpga-update/vuplus-fpga-update/dp_user_fpga

Continue reading...