Changeset 85197ef in oe-alliance-core
- Timestamp:
-
01/29/17 10:29:09
(6 years ago)
- Author:
- arn354 <arn354@…>
- Branches:
- 4.0, 4.3
- Children:
- a8b7809, dee2894
- Parents:
- bd139ed (diff), 9cb032f (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' into 4.0
# Resolved Conflicts:
# meta-brands/meta-gigablue/conf/machine/gb7356.conf
# meta-brands/meta-gigablue/conf/machine/gb7358.conf
# meta-brands/meta-gigablue/conf/machine/gb7362.conf
# meta-brands/meta-gigablue/conf/machine/gb73625.conf
# meta-oe/conf/distro/openhdf.conf
# meta-oe/conf/distro/openvix.conf
# meta-oe/recipes-distros/openhdf/image/openhdf-base.bb
# meta-oe/recipes-multimedia/tuxtxt/tuxtxt-enigma2.bb
# meta-oe/recipes-multimedia/tuxtxt/tuxtxt-enigma2/tuxtxt.ttf
# meta-oe/recipes-oe-alliance/enigma2-plugins/enigma2-3rdparty-plugins.bb
-
(No files)
-
