mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 00:41:09 +02:00
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:
@@ -643,6 +643,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
|
||||
if (fade && washidden)
|
||||
fader.StartFadeIn();
|
||||
checkHints();
|
||||
pos = selected;
|
||||
paint();
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user