Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-09-14 13:54:04 +02:00
61 changed files with 50439 additions and 713 deletions

View File

@@ -67,11 +67,13 @@ CStartUpWizard::~CStartUpWizard()
{
}
#ifdef ENABLE_FASTSCAN
const CMenuOptionChooser::keyval WIZARD_SETUP_TYPE[] =
{
{ 0, LOCALE_WIZARD_SETUP_EASY },
{ 1, LOCALE_WIZARD_SETUP_ADVANCED },
};
#endif
int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/)
{