Changeset 71e02a5 in oe-alliance-core

Timestamp:
01/02/17 16:57:04 (5 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
6042367
Parents:
f370822 (diff), 3963daf (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.