Stefan Seyfried a07b5d6289 Merge branch 'uncool/dvbsi++' commit c6136d612f ...

Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)



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

2012-12-30 21:35:20 +01: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

pedantic fixes

2012-05-08 18:59:11 +02:00

cnxtfb.h

Added comments about different blending modes as requested

2011-03-31 15:18:49 +00:00

control.h

svn_CROSSENVIRONMENT_coolstream: move files to new right place

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

cs_api.h

Fix include path for moved header files

2012-12-13 18:09:09 +01:00

cs_types.h

reworked CA menu code

2010-12-07 10:00:52 +00:00

cs_vfd.h

svn_CROSSENVIRONMENT_coolstream: move files to new right place

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

dmx_cs.h

libcs headers update

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

hardware_caps.cpp

hw_caps: fix compile on coolstream

2012-11-10 22:53:48 +01:00

hardware_caps.h

hw_caps: fix compile on coolstream

2012-11-10 22:53:48 +01:00

Makefile.am

hw_caps: fix compile on coolstream

2012-11-10 22:53:48 +01:00

mmi.h

reworked CA menu code

2010-12-07 10:00:52 +00:00

nevis_ir.h

svn_CROSSENVIRONMENT_coolstream: move files to new right place

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

playback_cs.h

libcs headers update

2012-03-28 16:16:09 +00: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

svn_CROSSENVIRONMENT_coolstream: move files to new right place

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

video_cs.h

Fix include path for moved header files

2012-12-13 18:09:09 +01:00