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

Origin commit data
------------------
Branch: ni/coolstream
Commit: ff282cbad1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-08-27 23:56:52 +02:00
8 changed files with 0 additions and 101 deletions

View File

@@ -842,7 +842,6 @@ struct SNeutrinoSettings
int ca_init;
int show_menu_hints_line;
int inetradio_autostart;
int infoviewer_icons;
#define MODE_ICONS_NR_OF_ENTRIES 8
int mode_icons;
int mode_icons_background;