[CST] Focus 6042fb95d8 Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next ...

Conflicts:
	lib/libconfigfile/configfile.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: aa60c85768
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-07 (Thu, 07 Mar 2013)



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

2013-03-07 17:10:57 +04:00

..

connection

extend debug output

2012-01-26 19:01:49 +00:00

libconfigfile

Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next

2013-03-07 17:10:57 +04:00

libcoolstream

add libcoolstream/cs_frontpanel.h copy

2013-01-11 15:14:12 +04:00

libcoolstream2

libcoolstream2/dmx_cs.h: update header

2013-02-13 14:09:47 +04:00

libdvbsub

Makefiles.am: add conditional include for libcoolstream

2013-01-11 14:17:16 +04:00

libeventserver

initialize volues

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

libmd5sum

Add missing $(top_builddir) to Makefile.am

2012-04-27 16:54:01 +01:00

libnet

lib/libnet/libnet.c: fix unused variable warning

2012-08-04 14:14:08 +04:00

libtriple

add generic dispatcher headers for frontend etc

2010-12-25 17:43:28 +00:00

libtuxtxt

Makefiles.am: add conditional include for libcoolstream

2013-01-11 14:17:16 +04:00

libupnpclient

fix gcc 4.7.x warnings

2012-07-07 13:09:08 +02:00

sectionsdclient

lib/sectionsdclient/sectionsdclient.cpp,h: comment unused

2012-08-30 15:55:32 +04:00

timerdclient

fix gcc 4.7.x warnings

2012-07-09 09:26:37 +02:00

xmltree

remove doubles include

2012-09-11 20:31:33 +02:00

Makefile.am

neutrino: add configure switch to disable upnp

2011-11-05 17:10:42 +00:00