Changeset f1c4c7c in oe-alliance-core
- Timestamp:
-
05/18/17 16:24:15
(6 years ago)
- Author:
- obi
- Children:
- 74eb8d9e
- Parents:
- e26f5ab3 (diff), 4f58c88e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
- Message:
-
Merge branch '3.4' of https://github.com/TitanNit/oe-alliance-core into 3.4
# Conflicts:
# meta-brands/meta-dream/conf/machine/dm520.conf
# meta-brands/meta-dream/conf/machine/dm900.conf
# meta-brands/meta-dream/conf/machine/include/dreambox-arm.inc
# meta-brands/meta-dream/recipes-bsp/libvc5driver_20160630r0.bb
# meta-brands/meta-dream/recipes-bsp/recovery_1.1.bb
# meta-brands/meta-dream/recipes-drivers/dreambox-dvb-modules-dm900.inc
# meta-brands/meta-dream/recipes-linux/linux-dreambox-3.14/dm900/defconfig
# meta-brands/meta-dream/recipes-linux/linux-dreambox_3.14.bb
# meta-brands/meta-dream/recipes-linux/linux-dreambox_3.2.bb
# meta-brands/meta-ini/conf/machine/inihdp.conf
# meta-brands/meta-vuplus/conf/machine/include/vuplus.inc
# meta-brands/meta-vuplus/conf/machine/vuultimo4k.conf
# meta-brands/meta-vuplus/recipes-blindscan/vuplus-blindscan-utils.bb
# meta-brands/meta-vuplus/recipes-bsp/vuplus-platform-util-vuduo2.bb
# meta-brands/meta-vuplus/recipes-bsp/vuplus-platform-util-vusolo2.bb
# meta-brands/meta-vuplus/recipes-bsp/vuplus-platform-util-vusolo4k.bb
# meta-brands/meta-vuplus/recipes-bsp/vuplus-platform-util-vusolose.bb
# meta-brands/meta-vuplus/recipes-bsp/vuplus-platform-util-vuultimo4k.bb
# meta-brands/meta-vuplus/recipes-bsp/vuplus-platform-util-vuuno4k.bb
# meta-brands/meta-vuplus/recipes-bsp/vuplus-wowl/wowl.sh
# meta-brands/meta-vuplus/recipes-bsp/webkit-hbbtv-browser-vuultimo4k.bb
# meta-brands/meta-vuplus/recipes-bsp/webkit-hbbtv-browser-vuuno4k.bb
# meta-brands/meta-vuplus/recipes-cfe/vuplus-initrd-cfe-vuultimo4k.bb
# meta-brands/meta-vuplus/recipes-cfe/vuplus-initrd-cfe-vuuno4k.bb
# meta-brands/meta-vuplus/recipes-drivers/vuplus-dvb-modules-vuduo2.bb
# meta-brands/meta-vuplus/recipes-drivers/vuplus-dvb-modules-vusolo2.bb
# meta-brands/meta-vuplus/recipes-drivers/vuplus-dvb-modules-vusolose.bb
# meta-brands/meta-vuplus/recipes-drivers/vuplus-dvb-proxy-vuduo2.bb
# meta-brands/meta-vuplus/recipes-drivers/vuplus-dvb-proxy-vusolo2.bb
# meta-brands/meta-vuplus/recipes-drivers/vuplus-dvb-proxy-vusolo4k.bb
# meta-brands/meta-vuplus/recipes-drivers/vuplus-dvb-proxy-vusolose.bb
# meta-brands/meta-vuplus/recipes-drivers/vuplus-dvb-proxy-vuultimo4k.bb
# meta-brands/meta-vuplus/recipes-drivers/vuplus-dvb-proxy-vuuno4k.bb
# meta-brands/meta-vuplus/recipes-graphics/libgles/vuplus-libgles-vuduo2.bb
# meta-brands/meta-vuplus/recipes-graphics/libgles/vuplus-libgles-vusolo2.bb
# meta-brands/meta-vuplus/recipes-graphics/libgles/vuplus-libgles-vusolo4k.bb
# meta-brands/meta-vuplus/recipes-graphics/libgles/vuplus-libgles-vusolose.bb
# meta-brands/meta-vuplus/recipes-graphics/libgles/vuplus-libgles-vuultimo4k.bb
# meta-brands/meta-vuplus/recipes-graphics/libgles/vuplus-libgles-vuuno4k.bb
# meta-brands/meta-vuplus/recipes-graphics/libvugles/libvugles2-mipsel.inc
# meta-brands/meta-vuplus/recipes-graphics/libvugles/libvugles2-vusolo4k.inc
# meta-brands/meta-vuplus/recipes-graphics/libvugles/libvugles2-vuultimo4k.inc
# meta-brands/meta-vuplus/recipes-graphics/libvugles/libvugles2-vuuno4k.inc
# meta-oe/recipes-connectivity/realtek/rt8723bs/rt8723bs-add-4.8-support.patch
# meta-oe/recipes-multimedia/exteplayer3/exteplayer3.bb
# meta-oe/recipes-multimedia/gstreamer1.0/gstreamer1.0-plugin-dvbmediasink.bb
-
(No files)
-
