Changeset 0f17e6a in oe-alliance-core

Timestamp:
11/14/16 14:45:24 (7 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
3a84bf1b, b082dcc
Parents:
c9646178 (diff), 52eb62d6 (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-brands/meta-gigablue/conf/machine/include/gigablue-oem.inc
# meta-oe/recipes-oe-alliance/enigma2-plugins/enigma2-3rdparty-plugins.bb

(No files)

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