Merge branch 'check/next' into master

Conflicts:
	data/locale/english.locale
	src/neutrino.cpp
	src/system/setting_helpers.cpp
This commit is contained in:
Stefan Seyfried
2013-03-07 17:10:11 +01:00
12 changed files with 335 additions and 319 deletions

View File

@@ -1494,12 +1494,12 @@ void CInfoViewer::display_Info(const char *current, const char *next,
pb_starty = CurrInfoY - ((pb_h * 2) + (pb_h / 6)) ;
pb_h = (pb_h/3);
pb_color = COL_INFOBAR_SHADOW_PLUS_0;
pb_color = 0;
break;
case 2:
pb_starty = CurrInfoY - ((pb_h * 2) + (pb_h / 5)) ;
pb_h = (pb_h/5);
pb_color = COL_INFOBAR_SHADOW_PLUS_0;
pb_color = 0;
break;
case 3:
pb_starty = CurrInfoY + ((pb_h / 3)-(pb_h/5)) ;