Changeset 47cd034 in oe-alliance-core

Timestamp:
11/23/16 09:25:12 (6 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
2459369, 2531ebb1, 6c1153bc
Parents:
06959efa (diff), 7c39f77 (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-oe/recipes-oe-alliance/image/oe-alliance-feeds.bb

(No files)

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