Changeset cdf93c7 in oe-alliance-core
- Timestamp:
-
09/18/16 00:51:35
(7 years ago)
- Author:
- arn354 <arn354@…>
- Branches:
- 4.0, 4.3
- Children:
- 22878e2
- Parents:
- 2d3de11 (diff), 48adbb4 (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 next
# Resolved Conflicts:
# meta-brands/meta-xcore/conf/machine/xc7362.conf
# meta-oe/conf/distro/openmips.conf
# meta-oe/recipes-oe-alliance/enigma2-network-drivers/enigma2-plugin-drivers-network-usb-rt3070.bb
# meta-oe/recipes-oe-alliance/enigma2-network-drivers/enigma2-plugin-drivers-network-usb-rt3573.bb
# meta-oe/recipes-oe-alliance/enigma2-network-drivers/enigma2-plugin-drivers-network-usb-rt5572.bb
# meta-oe/recipes-oe-alliance/enigma2-network-drivers/enigma2-plugin-drivers-network-usb-rtl8192cu.bb
-
(No files)
-
