vanhofen 6dfe9dc9ba Merge branch 'ni/tuxbox' into ni/mp/tuxbox ...

Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)



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

2016-11-02 09:50:10 +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

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

2016-10-25 13:08:01 +02:00

libcoolstream2

Merge branch 'cst-next' into nmp-cst-next

2016-08-19 17:40:48 +02:00

libdvbsub

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

2016-10-25 12:30:10 +02:00

libeventserver

…

libiw

Merge remote-tracking branch 'check/cst-next'

2014-12-25 18:03:08 +01: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 'ni/tuxbox' into ni/mp/tuxbox

2016-10-25 12:30:10 +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

Merge remote-tracking branch 'check/cst-next'

2015-02-07 23:12:01 +01:00

timerdclient

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

2016-11-02 09:50:10 +01:00

xmltree

Merge remote-tracking branch 'uncool/cst-next'

2015-12-13 17:41:55 +01:00

Makefile.am

remove obsolete embedded libtriple

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