vanhofen
|
fdda0de766
|
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
src/Makefile.am
Origin commit data
------------------
Commit: c582725f40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
|
2017-03-06 22:07:52 +01:00 |
|
vanhofen
|
97391211a4
|
move public libcoolstream-headers to hardware directory
Origin commit data
------------------
Commit: 2029a684e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
Origin message was:
------------------
- move public libcoolstream-headers to hardware directory
|
2017-03-06 21:49:32 +01:00 |
|
vanhofen
|
459cf4d8ea
|
port hardware_caps from Neutrino-MP
Origin commit data
------------------
Commit: 29fd05002f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
Origin message was:
------------------
- port hardware_caps from Neutrino-MP
|
2017-03-06 21:49:32 +01:00 |
|