Merge remote-tracking branch 'check/cst-next-fixed'

Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/osdlang_setup.cpp
This commit is contained in:
Stefan Seyfried
2015-02-19 13:59:13 +01:00
2 changed files with 6 additions and 5 deletions

View File

@@ -178,7 +178,6 @@ void COsdLangSetup::showLanguageSetup(CMenuWidget *osdl_setup)
{
struct dirent **namelist;
int n;
// printf("scanning locale dir now....(perhaps)\n");
const char *pfad[] = {DATADIR "/neutrino/locale", CONFIGDIR "/locale"};
osdl_setup->addIntroItems();