Changeset 20a6fa0 in oe-alliance-core

Timestamp:
12/22/16 20:18:19 (6 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
be17f58
Parents:
b09dc7f (diff), 847b66e1 (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/conf/distro/openvix.conf
# meta-oe/recipes-distros/openbh/image/openbh-enigma2.bb
# meta-oe/recipes-distros/openbh/image/openbh-feeds.bb
# meta-oe/recipes-oe-alliance/enigma2-plugins/enigma2-plugin-extensions-openwebif.bb
# meta-oe/recipes-oe-alliance/enigma2/enigma2.bb

(No files)

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