vanhofen
|
38dd0be012
|
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 8fb706226a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
|
2017-03-10 00:31:02 +01:00 |
|
Michael Liebmann
|
ec191c5a38
|
hardware_caps.cpp: Add hw ifdef for cs_get_chip_type()
Origin commit data
------------------
Commit: f5cdaff282
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)
|
2017-03-09 17:34:25 +01:00 |
|
vanhofen
|
afe0a772a9
|
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 4ed2244c39
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)
|
2017-03-09 13:43:47 +01:00 |
|
vanhofen
|
17fd0362e1
|
hardware_caps: add latest coolstream models
Origin commit data
------------------
Commit: b546ed517e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)
Origin message was:
------------------
- hardware_caps: add latest coolstream models
|
2017-03-09 12:51:44 +01:00 |
|
vanhofen
|
3a863c91f0
|
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
lib/Makefile.am
src/Makefile.am
src/neutrino.cpp
Origin commit data
------------------
Commit: e2d5f6ebf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
|
2017-03-06 22:40:18 +01:00 |
|
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 |
|