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

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

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-08-25 14:15:22 +02:00
parent a4ebf460c1 84b01945fb
commit 4198cb9a35
40 changed files with 225 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/system/settings.h
View File

@@ -464,6 +464,7 @@ struct SNeutrinoSettings
std::string password;
} network_nfs[NETWORK_NFS_NR_OF_ENTRIES];
std::string network_nfs_audioplayerdir;
std::string network_nfs_streamripperdir;
std::string network_nfs_picturedir;
std::string network_nfs_moviedir;
std::string network_nfs_recordingdir;