Changeset dfa48e1 in oe-alliance-core

Timestamp:
01/21/17 18:29:05 (6 years ago)
Author:
captain <openatv@…>
Branches:
4.0, 4.3
Children:
968ac339
Parents:
72a07dc0 (diff), ea42d70 (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

(No files)

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