Changeset 6e5ef39 in oe-alliance-core

Timestamp:
Nov 10, 2018, 7:01:22 PM (3 years ago)
Author:
arn354 <arn354@…>
Branches:
4.3
Children:
7eb8c50
Parents:
09b089a (diff), 96e0aae (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 '4.2' into 4.3

# Conflicts:
# meta-oe/recipes-devtools/python/python-attr_0.1.0.bb
# meta-oe/recipes-devtools/python/python-flickrapi_1.4.2.bb

are no longer in branch 4.3

(No files)

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