Changeset 7c4650d in oe-alliance-core

Timestamp:
12/04/16 10:46:03 (6 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
5741eb2, f294f2d
Parents:
bf30ada (diff), 3c39eec (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-oe-alliance/enigma2-plugins/enigma2-3rdparty-plugins.bb

(No files)

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