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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-12 22:32:07 +02:00
parent 88d02d6b60 f8e1da4418
commit e6d2ba00b3
41 changed files with 802 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/system/settings.h
View File

@@ -350,7 +350,6 @@ struct SNeutrinoSettings
P_MAIN_TOOLS,
P_MAIN_SCRIPTS,
P_MAIN_LUA,
P_MAIN_NI_MENU, //NI
P_MAIN_SETTINGS,
P_MAIN_SERVICE,
P_MAIN_SLEEPTIMER,
@@ -382,6 +381,8 @@ struct SNeutrinoSettings
P_MSER_RELOAD_CHANNELS,
P_MSER_BOUQUET_EDIT,
P_MSER_RESET_CHANNELS,
P_MSER_DAEMON_CONTROL,
P_MSER_CAMD_CONTROL,
P_MSER_RESTART,
P_MSER_RESTART_TUNER, //NI
P_MSER_RELOAD_PLUGINS,