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

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)

2017-08-23 15:24:38 +02:00

..

connection

…

hardware/coolstream

hw_caps: remove CFEManager-code; ...

2017-08-21 12:56:00 +02:00

jsoncpp

jsoncpp: update to current version 1.8.0

2017-03-28 21:23:10 +02:00

libconfigfile

fix compil use good oprator

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

libdvbsub

libdvbsub: add missing free() call

2017-06-16 18:22:19 +02:00

libeventserver

…

libiw

…

libmd5sum

some inits and never read var

2017-08-23 12:58:26 +02:00

libnet

…

libtuxtxt

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

2017-08-23 15:24:38 +02: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

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

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

xmltree

xmlinterface.cpp remove encoding option for load_string

2015-04-30 21:22:47 +02:00

Makefile.am

port hardware_caps from Neutrino-MP

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