Changeset 2459369 in oe-alliance-core

Timestamp:
11/23/16 16:09:19 (6 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
77f1162
Parents:
47cd034 (diff), d9b78dd (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' of ​https://github.com/oe-alliance/oe-alliance-core into 4.0

# Resolved Conflicts:
# meta-oe/recipes-oe-alliance/enigma2-plugins/enigma2-3rdparty-plugins.bb

(No files)

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