Stefan Seyfried 44ba8fafca Merge remote-tracking branch 'check/next-cc' ...

build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp

2014-04-27 19:14:06 +02:00

..

audiodec

Merge remote-tracking branch 'check/next-cc'

2014-02-19 11:29:29 +01:00

pictureviewer

Merge remote-tracking branch 'check/next-cc'

2014-04-27 19:14:06 +02:00

abstime.c

…

abstime.h

…

audiofile.cpp

…

audiofile.h

…

audiometadata.cpp

audiodecoder: Fix compile with ENABLE_FFMPEGDEC

2013-12-23 08:45:18 +01:00

audiometadata.h

audiodecoder: Fix compile with ENABLE_FFMPEGDEC

2013-12-23 08:45:18 +01:00

audioplay.cpp

driver/audioplay.cpp: cleanup header, init m_SecondsToSkip variable

2013-12-15 14:40:55 +04:00

audioplay.h

driver/audioplay.cpp: cleanup header, init m_SecondsToSkip variable

2013-12-15 14:40:55 +04:00

display.h

…

fade.cpp

- fix annoying gui flickering when fading is activated on nevis

2013-10-20 21:07:59 +02:00

fade.h

…

fader.cpp

…

fader.h

…

fb_window.cpp

…

fb_window.h

…

fbaccel.cpp

driver/fbaccel/spark: don't use blitter for drawing simple lines

2013-12-30 13:20:01 +01:00

fbaccel.h

framebuffer-ng: move more hw specific stuff to fbaccel

2013-11-09 15:53:24 +01:00

file.cpp

driver/file.cpp: add iso file type

2014-02-25 16:48:54 +04:00

file.h

Merge remote-tracking branch 'check/next-cc'

2014-04-27 19:14:06 +02:00

fontrenderer.cpp

Merge branch 'check/next-cc'

2013-11-30 20:17:31 +01:00

fontrenderer.h

remove widest_number definition and usage, add Font::getMaxDigitWidth() method instead

2013-11-29 23:02:50 +01:00

framebuffer_ng.cpp

framebuffer-ng: port commit 0dc92e99 to fix window sizes

2013-11-15 11:57:32 +01:00

framebuffer_ng.h

build fix for tripledragon after last merge

2013-12-22 21:27:03 +01:00

framebuffer.cpp

driver/framebuffer.cpp: try to load icons first from /var/tuxbox/icons/

2014-01-27 15:44:15 +04:00

framebuffer.h

Merge branch 'check/next-cc'

2013-11-10 16:55:53 +01:00

genpsi.cpp

…

genpsi.h

…

lcdd.cpp

Merge remote-tracking branch 'check/next-cc'

2014-01-23 14:08:37 +01:00

lcdd.h

remove unneeded CConfigFile from lcdd and shutdown_count

2013-11-13 10:39:04 +01:00

Makefile.am

Makefiles: simplify includes for libcoolstream/libstb-hal

2013-11-11 21:51:08 +01:00

netfile.cpp

Merge remote-tracking branch 'check/next-cc'

2013-12-22 21:25:05 +01:00

netfile.h

…

neutrinofonts.cpp

convert most char[...] configuration values to std::string

2013-12-25 12:08:14 +01:00

neutrinofonts.h

CComponentsFrmClock: Rework font handling

2013-11-28 16:07:48 +01:00

newclock.cpp

…

newclock.h

…

radiotext.cpp

…

radiotext.h

…

radiotools.cpp

…

radiotools.h

…

rcinput.cpp

Merge remote-tracking branch 'check/next-cc'

2014-04-27 19:14:06 +02:00

rcinput.h

Merge remote-tracking branch 'check/next-cc'

2014-04-27 19:14:06 +02:00

record.cpp

Merge remote-tracking branch 'check/next-cc'

2014-04-27 19:14:06 +02:00

record.h

Merge remote-tracking branch 'check/next-cc'

2014-04-27 19:14:06 +02:00

ringbuffer.c

…

ringbuffer.h

…

scanepg.cpp

driver/scanepg.cpp: add support to scan selected bouquets;

2014-03-27 18:56:49 +04:00

scanepg.h

driver/scanepg.cpp: add support to scan selected bouquets;

2014-03-27 18:56:49 +04:00

screen_max.cpp

…

screen_max.h

…

screenshot.cpp

…

screenshot.h

…

shutdown_count.cpp

Merge remote-tracking branch 'check/next-cc'

2014-01-27 21:00:18 +01:00

shutdown_count.h

remove unneeded CConfigFile from lcdd and shutdown_count

2013-11-13 10:39:04 +01:00

simple_display.cpp

…

spark_led.h

…

stacktrace.h

…

streamts.cpp

Merge remote-tracking branch 'check/next-cc'

2014-04-27 19:14:06 +02:00

streamts.h

driver/streamts.cpp: add support to stream from different tuners

2014-03-26 14:31:11 +04:00

vfd.cpp

vfd: fix signed-unsigned comparison warning

2014-01-23 14:17:49 +01:00

vfd.h

Merge remote-tracking branch 'check/next-cc'

2014-01-19 13:37:24 +01:00

volume.cpp

Merge remote-tracking branch 'check/next-cc'

2014-02-15 20:22:07 +01:00

volume.h

yWeb: Synchronize volume/audiomute settings yWeb => GUI

2014-02-12 06:02:27 +01:00

wav.h

…