Changeset 77f1162 in oe-alliance-core

Timestamp:
11/23/16 16:10:10 (7 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
478f681, da8c642
Parents:
2459369 (diff), 6c1153bc (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.0' of ​https://github.com/oe-alliance/oe-alliance-core into 4.0

# Resolved Conflicts:
# meta-oe/recipes-oe-alliance/enigma2-plugins/enigma2-plugin-extensions-openwebif.bb

(No files)

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