vanhofen d404deb1d2 Merge branch 'master' into pu/mp ...

Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: b12624d1fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)



------------------
This commit was generated by Migit

2017-03-20 01:31:51 +01:00

..

connection

…

hardware/coolstream

hardware_caps: fix has_fan and add detection of Neo Twin

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

jsoncpp

jsoncpp.cpp: re-apply gcc version compil fix

2016-01-26 14:11:33 +01:00

libconfigfile

fix compil use good oprator

2015-12-15 17:03:14 +01:00

libdvbsub

Merge remote-tracking branch 'tuxbox/master'

2017-03-07 19:43:06 +01:00

libeventserver

…

libiw

…

libmd5sum

libmd5sum: use tuxbox upstream code

2016-10-23 16:59:32 +02:00

libnet

…

libtuxtxt

tuxtxt: remove dead code, unnecessary header includes

2017-02-21 06:38:48 +01:00

libupnpclient

lib/libupnpclient fix segfault if parser is NULL

2015-06-28 15:13:14 +02:00

luaclient

…

sectionsdclient

sectionsdclient: remove unused scanMode variable

2017-02-12 22:48:55 +01:00

timerdclient

make sure the private dvb headers are used on coolstream

2016-11-16 20:30:14 +01:00

xmltree

Merge remote-tracking branch 'uncool/cst-next'

2015-12-13 17:41:55 +01:00

Makefile.am

port hardware_caps from Neutrino-MP

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