Changeset 6bf3c8b in oe-alliance-core

Timestamp:
01/30/17 09:20:48 (6 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
1ab39cbc, 385acab
Parents:
dee2894 (diff), 7dea8fd3 (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/include/gigablue-oem.inc
# meta-oe/conf/distro/openvix.conf

(No files)

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