recycled-ni-neutrino

mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00

Files

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

Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



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

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

connection

lib/connection/basicserver: raise queue limit

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

hardware/coolstream

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

2017-03-12 22:03:03 +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