vanhofen 5e5451332e Merge branch 'ni/tuxbox' into ni/mp/tuxbox ...

Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



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

2017-02-28 16:55:39 +01:00

..

connection

lib/connection/basicserver: raise queue limit

2014-09-29 14:38:20 +04: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

libcoolstream

Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

2016-10-25 13:08:01 +02:00

libcoolstream2

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

2017-02-28 16:55:39 +01:00

libdvbsub

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

2017-02-12 23:04:09 +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

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

2017-02-21 15:14:59 +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

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

2017-02-12 23:04:09 +01:00

timerdclient

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2016-11-16 23:43:57 +01:00

xmltree

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

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

Makefile.am

more rename hardware defined macros for coolstream stb

2017-02-12 22:21:18 +01:00