Changeset 2bf5ef73 in oe-alliance-core

Timestamp:
12/23/16 20:29:42 (7 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
7ce43f2
Parents:
5f05d0d (diff), e33757e (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.