Changeset edfe592 in oe-alliance-core

Timestamp:
11/12/16 21:25:26 (7 years ago)
Author:
arn354 <arn354@…>
Branches:
4.0, 4.3
Children:
1cc0a9f, a0549738
Parents:
8d2741b (diff), a9ffab1c (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-cube/recipes-linux/linux-cube_2.6.34.bb
# meta-oe/conf/distro/openvix.conf
# meta-oe/recipes-oe-alliance/image/oe-alliance-feeds.bb

(No files)

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