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:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff2ee78317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-05-16 15:28:08 +02:00
parent cc75e46888 c874a5aedf
commit dd4501697b
23 changed files with 185 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/system/settings.h
View File

@@ -789,6 +789,7 @@ struct SNeutrinoSettings
//movieplayer
int movieplayer_repeat_on;
int movieplayer_bisection_jump; //NI
std::string youtube_dev_id;
int youtube_enabled;
std::string tmdb_api_key;