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

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



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

2017-02-12 23:01:15 +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

libcoolstream2/playback_cs.h: update header

2016-03-28 13:29:57 +03:00

libcoolstream2

lib/libcoolstream2/cs_api.h: update header

2016-04-14 17:28:32 +03:00

libdvbsub

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

2017-02-12 23:01:15 +01:00

libeventserver

initialize volues

2012-05-09 17:33:34 +02:00

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 https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-02-12 23:01:15 +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

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

remove obsolete embedded libtriple

2016-10-23 12:19:06 +02:00