Changeset 089112b0 in oe-alliance-core
- Timestamp:
-
01/04/17 16:59:52
(5 years ago)
- Author:
- arn354 <arn354@…>
- Branches:
- 4.0, 4.3
- Children:
- 23bc799
- Parents:
- a76c300 (diff), 3452c4b (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-skylake/recipes-linux/linux-skylake_4.8.3.bb
# meta-brands/meta-xtrend/recipes-drivers/et-dvb-modules-et10000.bb
# meta-brands/meta-xtrend/recipes-drivers/et-dvb-modules-et4x00.bb
# meta-brands/meta-xtrend/recipes-drivers/et-dvb-modules-et8000.bb
# meta-brands/meta-xtrend/recipes-linux/linux-etxx00_3.8.7.bb
# meta-oe/conf/distro/openvix.conf
# meta-oe/recipes-oe-alliance/enigma2-plugins/enigma2-3rdparty-plugins.bb
-
(No files)
-
