vanhofen ae3ecfdcfb Merge remote-tracking branch 'neutrino-mp/master' into pu/mp ...

Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


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



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

2017-03-13 16:14:33 +01:00

..

connection

lib/connection/basicserver: raise queue limit

2014-09-29 14:38:20 +04:00

hardware/coolstream

hardware_caps: just changes in comments

2017-03-10 15:07:52 +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

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

2014-12-25 18:03:08 +01:00

libmd5sum

libmd5sum: use tuxbox upstream code

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

libnet

gui/nfs: implement mac address lookup

2014-09-15 14:04:20 +04:00

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

luaclient: fix "jump to...crosses initialization of" error

2015-02-04 12:35:40 +01:00

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