vanhofen 4a4762935b Merge branch 'ni/tuxbox' into ni/mp/tuxbox ...

Conflicts:
	acinclude.m4


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



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

2017-03-26 23:25:43 +02:00

..

connection

…

hardware/coolstream

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

2017-03-26 23:25:43 +02: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 branch 'ni/tuxbox' into ni/mp/tuxbox

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

libeventserver

…

libiw

…

libmd5sum

libmd5sum: use tuxbox upstream code

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

libnet

…

libtuxtxt

tuxtxt.cpp: align to tuxbox-neutrino

2017-03-11 12:50:36 +01:00

libupnpclient

lib/libupnpclient fix segfault if parser is NULL

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

luaclient

…

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

port hardware_caps from Neutrino-MP

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