Merge branch 'master' into pu/fb-setmode

Origin commit data
------------------
Branch: ni/coolstream
Commit: 9209326a1b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-02-22 06:25:45 +01:00
11 changed files with 308 additions and 134 deletions

View File

@@ -504,7 +504,6 @@ struct SNeutrinoSettings
int key_list_end;
int key_power_off;
int menu_left_exit;
int key_click;
int timeshift_pause;
int auto_timeshift;
int temp_timeshift;