vanhofen 57b326e0ef Merge branch 'ni/tuxbox' into ni/mp/tuxbox ...

Conflicts:
	src/gui/audioplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 197dfd1c41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)



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

2017-06-18 00:58:47 +02:00

..

connection

…

hardware/coolstream

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

2017-06-15 11:07:32 +02:00

jsoncpp

jsoncpp: update to current version 1.8.0

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

libconfigfile

…

libdvbsub

libdvbsub: add missing free() call

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

libeventserver

…

libiw

…

libmd5sum

…

libnet

…

libtuxtxt

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

2017-04-26 11:17:46 +02:00

libupnpclient

…

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

…

Makefile.am

port hardware_caps from Neutrino-MP

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