Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-29 15:15:34 +01:00
51 changed files with 509 additions and 177 deletions

View File

@@ -281,6 +281,7 @@ CTimerList::CTimerList()
timerNew_message = "";
timerNew_pluginName = "";
httpConnectTimeout = 3;
changed = false;
/* most probable default */
saved_dispmode = (int)CVFD::MODE_TVRADIO;