Changeset a0277ec in oe-alliance-core

Timestamp:
11/21/17 15:25:00 (5 years ago)
Author:
arn354 <arn354@…>
Branches:
4.3
Children:
098461d1
Parents:
faa51d3 (diff), 6e106cc (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 '4.1' into nextp3

# Resolved Conflicts:
# meta-oe/conf/distro/openbh.conf
# meta-oe/recipes-oe-alliance/enigma2-plugins/enigma2-3rdparty-plugins.bb

(No files)

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