Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-09-13 13:40:40 +02:00
44 changed files with 349 additions and 687 deletions

View File

@@ -267,7 +267,6 @@ struct SNeutrinoSettings
int ci_tuner;
std::string ci_pincode;
int radiotext_enable;
int easymenu;
//screen saver
int screensaver_delay;