vanhofen 55daa20bed Merge branch 'ni/tuxbox' into ni/mp/tuxbox ...

Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/lcdd.h
	src/driver/rcinput.cpp
	src/driver/rcinput.h
	src/driver/screenshot.cpp
	src/driver/screenshot.h
	src/driver/simple_display.cpp
	src/driver/vfd.cpp
	src/gui/audio_select.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/zapit/include/zapit/capmt.h
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1fa735aa45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)



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

2017-11-03 00:09:05 +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-11-03 00:09:05 +01:00

jsoncpp

add comments to suppres -Wimplicit-fallthrough warnings

2017-09-26 12:41:05 +02:00

libconfigfile

fix compil use good oprator

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

libdvbsub

Revert "- libdvbsub: add missing free() call"

2017-10-16 10:44:19 +02:00

libeventserver

…

libiw

Merge branch 'master' into pu/mp

2017-09-13 13:40:40 +02:00

libmd5sum

some inits and never read var

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

libnet

…

libtuxtxt

tuxtxt_common.h: add missing init to readcnt

2017-10-29 18:31:13 +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

2017-10-18 09:41:46 +02: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