Changeset 18d54901 in oe-alliance-core

Timestamp:
02/15/17 20:07:57 (5 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
9c33e82
Parents:
823f5e0 (diff), 9d3d318 (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-wifi.bb

(No files)

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