Changeset 442160a in oe-alliance-core

Timestamp:
02/10/17 09:36:50 (6 years ago)
Author:
captain <openatv@…>
Branches:
4.0, 4.3
Children:
8bac4ed7, c54e3d43
Parents:
a8f70995 (diff), e6fe7b5 (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.