Merge remote-tracking branch 'tuxbox/master'

Origin commit data
------------------
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
This commit is contained in:
Stefan Seyfried
2016-11-12 18:06:26 +01:00
58 changed files with 6498 additions and 735 deletions

View File

@@ -162,7 +162,7 @@ class CTimerd
char pluginName[EXEC_PLUGIN_NAME_MAXLEN]; //only filled if applicable
char recordingDir[RECORD_DIR_MAXLEN]; //only filled if applicable
char epgTitle[EPG_TITLE_MAXLEN]; //only filled if applicable
char remotebox_ip[16];
char remotebox_name[25];
int rem_pre;
int rem_post;