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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 796bd79e0e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-06-02 21:42:10 +02:00
parent d9980f2d87 8e429f9e6a
commit cec7e5b8bb
12 changed files with 110 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/system/settings.h
View File

@@ -449,6 +449,7 @@ struct SNeutrinoSettings
int recording_startstop_msg;
int shutdown_timer_record_type;
std::string recording_filename_template;
int recording_already_found_check;
int filesystem_is_utf8;
// default plugin for ts-movieplayer (red button)