Changeset 005b2c0 in oe-alliance-core

Timestamp:
11/27/16 16:24:21 (6 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
1812a27, 1b3e609
Parents:
2eeadaf (diff), 89e13dca (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

# Conflicts:
# meta-oe/recipes-oe-alliance/image/oe-alliance-feeds.bb

(No files)

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