Changeset f370822 in oe-alliance-core

Timestamp:
01/02/17 16:36:10 (5 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
71e02a5
Parents:
8cfad25 (diff), 5dac4c4e (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-ceryon/conf/machine/include/ceryon-oem.inc
# meta-brands/meta-gigablue/conf/machine/gb7356.conf
# meta-brands/meta-gigablue/conf/machine/gb7362.conf
# meta-brands/meta-gigablue/conf/machine/gb73625.conf
# meta-brands/meta-skylake/conf/machine/hd2400.conf
# meta-brands/meta-xcore/conf/machine/xc7362.conf
# meta-brands/meta-xtrend/conf/machine/et4x00.conf
# meta-brands/meta-xtrend/conf/machine/include/etxx00.inc

(No files)

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