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

Origin commit data
------------------
Branch: ni/coolstream
Commit: 89beeb2c10
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-01-27 18:49:24 +01:00
51 changed files with 417 additions and 262 deletions

View File

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