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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)



------------------
This commit was generated by Migit
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

@@ -643,6 +643,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
if (fade && washidden)
fader.StartFadeIn();
checkHints();
pos = selected;
paint();
break;
}