Changeset e809a5ac in oe-alliance-core

Timestamp:
11/11/16 10:11:26 (6 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
94ae2e0
Parents:
d979102c (diff), d282bbe5 (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/enigma2-plugins/enigma2-plugin-extensions-openwebif.bb

(No files)

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