mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-26 15:02:56 +02:00
delete src/neutrino.cpp.~ .rej
This commit is contained in:
@@ -1,9 +0,0 @@
|
||||
diff a/src/neutrino.cpp b/src/neutrino.cpp (rejected hunks)
|
||||
@@ -690,6 +690,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
|
||||
g_settings.channellist_foot = configfile.getInt32("channellist_foot" , 1);//default next Event
|
||||
g_settings.channellist_new_zap_mode = configfile.getInt32("channellist_new_zap_mode", 1);
|
||||
g_settings.channellist_sort_mode = configfile.getInt32("channellist_sort_mode", 0);//sort mode: alpha, freq, sat
|
||||
+ g_settings.channellist_minitv = configfile.getInt32("channellist_minitv", 0); //default off
|
||||
|
||||
//screen configuration
|
||||
g_settings.screen_xres = configfile.getInt32("screen_xres", 100);
|
3881
src/neutrino.cpp~
3881
src/neutrino.cpp~
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user