Changeset 31a39306 in oe-alliance-core

Timestamp:
11/29/16 14:35:15 (5 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
38876a3, dec0f0f
Parents:
9f61d70 (diff), 825d30a9 (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-formuler/recipes-drivers/formuler-dvb-modules-formuler4turbo.bb
# meta-oe/conf/distro/openbh.conf
# meta-oe/conf/distro/openvix.conf
# meta-oe/recipes-distros/openvix/release

(No files)

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