Stefan Seyfried adb23b23ee Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6' ...

...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp

2012-10-14 12:51:07 +02: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

cs_api.h

-pedantic fixes

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

cs_types.h

* reworked CA menu code

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

dmx_cs.h

libcs headers update

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

hardware_caps.h

neutrino: start to use hardware_caps

2012-09-23 21:34:47 +02:00

mmi.h

* reworked CA menu code

2010-12-07 10:00:52 +00: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

video_cs.h

Enable screenshots; handle screenshot key in streaminfo

2012-02-15 13:34:07 +00:00