Merge branch 'check/next-cc'

again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp
This commit is contained in:
Stefan Seyfried
2013-07-06 19:01:15 +02:00
91 changed files with 5546 additions and 562 deletions

View File

@@ -151,6 +151,7 @@ class CInfoViewer
int BoxEndY;
int ChanInfoX;
bool showButtonBar;
bool isVolscale;
CInfoViewer();
~CInfoViewer();