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

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

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-21 12:46:49 +01:00
parent ccd9e67d78 f57041a98b
commit 6b0e887585
125 changed files with 3517 additions and 3169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/settings.h
View File

@@ -288,6 +288,7 @@ struct SNeutrinoSettings
int epg_save_standby;
int epg_save_frequently;
int epg_read;
int epg_read_frequently;
int epg_cache;
int epg_old_events;
int epg_max_events;
@@ -697,6 +698,7 @@ struct SNeutrinoSettings
FONT_TYPE_MOVIEBROWSER_LIST,
FONT_TYPE_MOVIEBROWSER_INFO,
FONT_TYPE_SUBTITLES,
FONT_TYPE_MESSAGE_TEXT,
FONT_TYPE_COUNT
};