Changeset 0dfaa0b in oe-alliance-core

Timestamp:
01/01/17 16:00:41 (5 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
373ea5d
Parents:
ad9d519 (diff), adec1379 (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-distros/openspa/image/openspa-feeds.bb
# meta-oe/recipes-oe-alliance/enigma2/enigma2.bb

(No files)

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