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

Conflicts:
	configure.ac
	data/icons/filetypes/mp3.png
	data/icons/filetypes/picture.png
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/filebrowser.cpp
	src/gui/followscreenings.cpp
	src/gui/followscreenings.h
	src/gui/osd_setup.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 75db11c2e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)



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

2017-06-07 15:14:51 +02:00

..

connection

lib/connection/basicserver: raise queue limit

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

hardware/coolstream

HD1: Workaround for missing cs_get_chip_type

2017-06-07 14:16:11 +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

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

2017-03-09 10:08:13 +01:00

libeventserver

…

libiw

libiw/iwscan.cpp: fix crash in case of different cmd order

2014-07-16 11:52:24 +04:00

libmd5sum

md5.c: Fix compiler warning (copy from gcc)

2014-09-25 11:05:29 +04:00

libnet

gui/nfs: implement mac address lookup

2014-09-15 14:04:20 +04:00

libtuxtxt

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

2017-04-26 11:17:46 +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