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

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

Browse Source 
Conflicts:
	data/icons/headers/mainmenue.png
	data/icons/headers/settings.png
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/settings_manager.cpp


Origin commit data
------------------
Commit: d756ed789a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-17 (Sun, 17 Dec 2017)
This commit is contained in:
vanhofen
2017-12-17 23:38:33 +01:00
parent fc0c1ac32d 3f9101a5f4
commit dacaa76427
6 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/neutrino.cpp
View File

@@ -893,6 +893,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.backup_dir = configfile.getString("backup_dir", "/media");
g_settings.backup_dir = configfile.getString("backup_dir", "/media");
g_settings.update_dir = configfile.getString("update_dir", "/tmp");
g_settings.update_dir_opkg = configfile.getString("update_dir_opkg", g_settings.update_dir);