mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	src/gui/plugins.h
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 6cfea8c955
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)
This commit is contained in:
vanhofen
2017-09-21 10:36:43 +02:00
parent 0e3522fc52 e137542efe
commit b6f0973650
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/videosettings.cpp
View File

@@ -429,7 +429,7 @@ int CVideoSettings::showVideoSetup()
if (vs_videomodes_fw != NULL)
videosetup->addItem(vs_videomodes_fw); //video modes submenue
#ifdef BOXMODEL_CS_HD2
videosetup->addItem(vs_automodes_fw); //video auto modes submenue
videosetup->addItem(vs_automodes_fw); //video auto modes submenue
#endif
#ifdef BOXMODEL_CS_HD2