Merge remote-tracking branch 'tuxbox/master'

This commit is contained in:
Stefan Seyfried
2017-02-01 22:03:40 +01:00
45 changed files with 409 additions and 286 deletions

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 {