mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: eca8f5459b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-19 (Sun, 19 Jan 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-01-19 13:37:24 +01:00
parent 9f67acf417 81ec9a0e26
commit 19cb443dec
15 changed files with 213 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/vfd_setup.cpp
View File

@@ -149,6 +149,10 @@ int CVfdSetup::showSetup()
vfds->addItem(oj);
vfds->addItem(lcd_clock_channelname_menu);
oj = new CMenuOptionChooser(LOCALE_LCDMENU_SCROLL, &g_settings.lcd_scroll, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, vfd_enabled);
oj->setHint("", LOCALE_MENU_HINT_VFD_SCROLL);
vfds->addItem(oj);
int res = vfds->exec(NULL, "");
delete vfds;