vanhofen d9fc0a4a98 Merge branch 'ni/tuxbox' into ni/mp/tuxbox ...

Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: ed38125791
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

2017-03-19 01:07:17 +01:00

..

hd1/libcoolstream

hd1/libcoolstream/cs_api.h: Update for new libcoolstream functions

2017-03-10 14:35:32 +01:00

hd2/libcoolstream

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-03-12 22:03:03 +01:00

hardware_caps.cpp

hardware_caps: fix has_fan and add detection of Neo Twin

2017-03-19 01:04:48 +01:00

hardware_caps.h

port hardware_caps from Neutrino-MP

2017-03-06 21:49:32 +01:00

Makefile.am

hardware_caps: fix has_fan and add detection of Neo Twin

2017-03-19 01:04:48 +01:00