[CST] Focus 93eb0c1679 Merge branch 'next' into next-cc ...

Conflicts:
	data/locale/english.locale
	src/driver/framebuffer.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f8ef9ec46
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-02 (Sun, 02 Jun 2013)



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

2013-06-02 10:46:42 +04:00

..

connection

extend debug output

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

libconfigfile

use var passed by reference

2013-04-30 12:59:25 +04:00

libcoolstream

Merge branch 'next' into next-cc

2013-06-02 10:46:42 +04:00

libcoolstream2

sync apollo libcs headers

2013-05-10 16:34:48 +04:00

libdvbsub

dvbsubtitle: Fix segfault in destructor

2013-05-10 17:09:06 +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

use var passed by reference

2013-04-30 12:59:25 +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