mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-27 23:42:51 +02:00
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:
@@ -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)
|
||||
|
Reference in New Issue
Block a user