Changeset 8f2399a6 in oe-alliance-core

Timestamp:
12/28/16 10:31:37 (5 years ago)
Author:
captain <openatv@…>
Branches:
4.0, 4.3
Children:
961a194
Parents:
af33e43 (diff), 369d970 (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.