Changeset b9eda1b in oe-alliance-core

Timestamp:
09/30/16 16:51:03 (6 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
f60349d
Parents:
dfb09a2 (diff), 2ed23a0 (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 next

# Resolved Conflicts:
# meta-brands/meta-dags/conf/machine/include/dags-oem.inc
# meta-brands/meta-gfutures/recipes-linux/linux-gfutures_4.0.1.bb
# meta-brands/meta-ini/recipes-linux/linux-ini-hdx_3.6.0.bb
# meta-brands/meta-skylake/recipes-linux/linux-skylake_4.7.4.bb
# meta-brands/meta-xcore/conf/machine/include/xcore-oem.inc
# meta-oe/conf/distro/openmips.conf
# meta-oe/recipes-oe-alliance/enigma2-plugins/enigma2-3rdparty-plugins.bb

(No files)

Note: See TracChangeset for help on using the changeset viewer.