Merge branch 'dvbsi++' into next

Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
This commit is contained in:
[CST] Focus
2013-02-28 16:39:34 +04:00
70 changed files with 544 additions and 417 deletions

View File

@@ -823,7 +823,7 @@ int CScanSetup::showScanMenuLnbSetup()
sat_setup->addIntroItems();
satellite_map_t & satmap = fe->getSatellites();
INFO("satmap size = %d", satmap.size());
INFO("satmap size = %d", (int)satmap.size());
CMenuWidget *tmp[satmap.size()];
for (sat_iterator_t sit = satmap.begin(); sit != satmap.end(); ++sit)