Changeset 5469ff0 in oe-alliance-core

Timestamp:
10/01/16 14:35:05 (6 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
bb62329
Parents:
6d03b747 (diff), f792e8c1 (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 'next' into nextp3

# Resolved Conflicts:
# meta-brands/meta-gfutures/recipes-linux/linux-gfutures-4.7.3/hd11/defconfig -> deleted
# meta-oe/conf/distro/openmips.conf -> kept existing version
# meta-oe/conf/distro/openvix.conf -> kept existing version

(No files)

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