Stefan Seyfried e4e9fb1e46 Merge remote-tracking branch 'test/cst-next' ...

Conflicts:
	src/gui/osdlang_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 48fdfc5e5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)



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

2015-02-19 14:10:26 +01:00

..

connection

lib/connection/basicserver: raise queue limit

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

libconfigfile

lib/libconfigfile/configfile.cpp: add deleteKey()

2014-09-09 15:28:35 +04:00

libcoolstream

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

2014-02-23 15:17:48 +01:00

libcoolstream2

some enum warrnings compil fixes

2015-02-15 22:16:47 +01:00

libdvbsub

Makefiles: simplify includes for libcoolstream/libstb-hal

2013-11-11 21:51:08 +01:00

libeventserver

initialize volues

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

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 remote-tracking branch 'check/cst-next'

2014-12-25 18:03:08 +01:00

libupnpclient

use empty to check string

2015-01-09 17:15:11 +01: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 remote-tracking branch 'check/cst-next'

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

xmltree

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

2014-12-25 18:03:08 +01:00

Makefile.am

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

2014-12-25 18:03:08 +01:00