vanhofen
|
42a7ef830b
|
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
configure.ac
Origin commit data
------------------
Branch: ni/coolstream
Commit: 624691ea0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
------------------
This commit was generated by Migit
|
2016-12-15 14:12:33 +01:00 |
|