mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 18:01:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/fb-setmode

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: bab10ee438
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 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-03-06 22:06:38 +01:00
parent a41f318adc ca1ebd7eb2
commit 875905608d
46 changed files with 152 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/system/settings.h
View File

@@ -39,6 +39,8 @@
#include <zapit/client/zapittools.h>
#include <eitd/edvbstring.h> // UTF8
#include <hardware_caps.h>
#include <string>
#include <list>
@@ -933,6 +935,7 @@ struct SglobalInfo
unsigned char box_Type;
delivery_system_t delivery_system;
bool has_fan;
hw_caps_t *hw_caps;
};
const int RECORDING_OFF = 0;