Merge branch 'check/next-cc'

Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-11-10 16:55:53 +01:00
114 changed files with 7292 additions and 1585 deletions

View File

@@ -61,7 +61,7 @@
extern int cs_test_card(int unit, char * str);
#endif
#ifdef TEST_MENU
CTestMenu::CTestMenu()
{
width = w_max (50, 10);
@@ -744,4 +744,3 @@ void CTestMenu::showHWTests(CMenuWidget *widget)
}
CFEManager::getInstance()->linkFrontends(true);
}
#endif