Merge branch 'uncool/dvbsi++' commit 785d3f2046

Conflicts:
	src/eitd/SIevents.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e701bfefc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-29 (Tue, 29 Jan 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-01-29 21:27:41 +01:00
9 changed files with 14 additions and 13 deletions

View File

@@ -644,7 +644,7 @@ int CScanSetup::showUnicableSetup()
uni_setup->addIntroItems();
uni_setup->addItem(uniscr);
CMenuForwarder *mf = new CMenuForwarder(LOCALE_UNICABLE_QRG, true, uniqrg->getValue(), uniqrg);
CMenuForwarder *mf = new CMenuDForwarder(LOCALE_UNICABLE_QRG, true, uniqrg->getValue(), uniqrg);
uni_setup->addItem(mf);
res = uni_setup->exec(NULL, "");
delete uni_setup;