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

Merge remote-tracking branch 'tuxbox/master'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7497722646
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-02-01 22:03:40 +01:00
parent cd7dc7a667 995e202c5b
commit b887345480
45 changed files with 409 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/locals.h
View File

@@ -346,7 +346,6 @@ typedef enum
LOCALE_COLORMENU_ADVANCED_MODE_ON,
LOCALE_COLORMENU_BACKGROUND,
LOCALE_COLORMENU_CLOCK_TEXTCOLOR,
LOCALE_COLORMENU_CONTRAST_FONTS,
LOCALE_COLORMENU_FADE,
LOCALE_COLORMENU_FONT,
LOCALE_COLORMENU_FONT_TTX,
@@ -1057,7 +1056,6 @@ typedef enum
LOCALE_MENU_HINT_COLORS,
LOCALE_MENU_HINT_CONTENT_BACK,
LOCALE_MENU_HINT_CONTENT_TEXTCOLOR,
LOCALE_MENU_HINT_CONTRAST_FONTS,
LOCALE_MENU_HINT_DBOXINFO,
LOCALE_MENU_HINT_DELETE_CHANNELS,
LOCALE_MENU_HINT_DELETE_REMOVED,

2
src/system/locals_intern.h
View File

@@ -346,7 +346,6 @@ const char * locale_real_names[] =
"colormenu.advanced_mode_on",
"colormenu.background",
"colormenu.clock_textcolor",
"colormenu.contrast_fonts",
"colormenu.fade",
"colormenu.font",
"colormenu.font_ttx",
@@ -1057,7 +1056,6 @@ const char * locale_real_names[] =
"menu.hint_colors",
"menu.hint_content_back",
"menu.hint_content_textcolor",
"menu.hint_contrast_fonts",
"menu.hint_dboxinfo",
"menu.hint_delete_channels",
"menu.hint_delete_removed",

2
src/system/settings.h
View File

@@ -426,8 +426,6 @@ struct SNeutrinoSettings
SNeutrinoTheme theme;
bool osd_colorsettings_advanced_mode;
int contrast_fonts;
//network
#define NETWORK_NFS_NR_OF_ENTRIES 8
struct {