Changeset ad9d519 in oe-alliance-core

Timestamp:
01/01/17 13:43:56 (5 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
0dfaa0b
Parents:
476bf867 (diff), f43a8df (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/enigma2.bb

(No files)

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