Merge remote-tracking branch 'check/next-cc'

Origin commit data
------------------
Branch: ni/coolstream
Commit: 5976f03ca2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-07 (Sat, 07 Dec 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-12-07 18:28:56 +01:00
11 changed files with 37 additions and 44 deletions

View File

@@ -443,7 +443,7 @@ printf("C: %d S: %d T: %d\n", CFEManager::getInstance()->haveCable(),CFEManager:
r_system = DVB_C;
//--------------------------------------------------------------
settings->addItem(GenericMenuSeparatorLine);
//settings->addItem(GenericMenuSeparatorLine);
//--------------------------------------------------------------
//tune timeout
if(CFEManager::getInstance()->getFrontendCount() <= 1) {