[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

..

.svnignore

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

audio_cs.h

libcs headers update

2012-03-28 16:16:09 +00:00

ca_cs.h

libcoolstream/ca_cs.h: sync header

2013-03-08 17:56:03 +04:00

cnxtfb.h

fix comma at end of enumerator list

2013-05-28 15:52:31 +02:00

control.h

lib/libcoolstream: sync headers

2013-01-11 11:10:58 +04:00

cs_api.h

lib/libcoolstream: sync headers

2013-01-11 11:10:58 +04:00

cs_frontpanel.h

fix comma at end of enumerator list

2013-05-28 15:52:31 +02:00

cs_types.h

lib/libcoolstream: sync headers

2013-01-11 11:10:58 +04:00

cs_vfd.h

fix comma at end of enumerator list

2013-05-28 15:52:31 +02:00

dmx_cs.h

libcs headers update

2012-03-28 16:16:09 +00:00

mmi.h

lib/libcoolstream: sync headers

2013-01-11 11:10:58 +04:00

nevis_ir.h

svn_CROSSENVIRONMENT_coolstream: move files to new right place

2012-12-13 10:49:06 +01:00

playback_cs.h

lib/libcoolstream/playback_cs.h: new header

2013-05-30 10:24:46 +04:00

playback.h

add generic dispatcher headers for frontend etc

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

pwrmngr.h

fix compil warrnings

2010-12-31 14:58:54 +00:00

record_cs.h

lib/libcoolstream/record_cs.h: update header

2012-09-25 17:13:43 +04:00

tsrouter.h

lib/libcoolstream: sync headers

2013-01-11 11:10:58 +04:00

video_cs.h

lib/libcoolstream/video_cs.h: sync header

2013-03-08 17:33:28 +04:00