Changeset 04f053d in oe-alliance-core

Timestamp:
11/09/16 17:59:18 (6 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
6f19e431, d5b4d96
Parents:
53ec134 (diff), 6a3c314a (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-octagon/conf/machine/include/octagon.inc
# meta-brands/meta-octagon/conf/machine/sf4008.conf
# meta-brands/meta-octagon/recipes-drivers/octagon-dvb-modules-sf4008.bb
# meta-brands/meta-octagon/recipes-linux/linux-octagon_4.1.35.bb
# meta-oe/conf/distro/openvix.conf
# meta-oe/recipes-oe-alliance/enigma2-plugins/enigma2-plugin-extensions-openwebif.bb
# meta-oe/recipes-oe-alliance/image/oe-alliance-enigma2.bb

(No files)

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