Changeset 1a3c70c in oe-alliance-core

Timestamp:
12/02/14 14:40:21 (8 years ago)
Author:
a4tech <darezik@…>
Branches:
4.0, 4.3
Children:
46870534
Parents:
a711b3c (diff), ebeef3f (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 '2.3' of https://github.com/oe-alliance/oe-alliance-core into next

Conflicts:

meta-oe/recipes-multimedia/media-tree-dvb-sky/usb-dvb-dvbsky_140912.bb
meta-oe/recipes-multimedia/media-tree-dvb-sky/usb-dvb-dvbsky_141106.bb
meta-oe/recipes-oe-alliance/image/oe-alliance-feeds.bb

(No files)

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