Merge branch 'master' into next

2017-07-09 15:08:51 +01:00 · 2017-07-09 15:08:51 +01:00 · 2350e94a9f
parent f0ffd691f4 2ac566fa85
commit 2350e94a9f
1 changed files with 1 additions and 1 deletions
--- a/src/y_inter.c
+++ b/src/y_inter.c
@ -236,7 +236,7 @@ void Y_IntermissionDrawer(void)
 			ST_DrawNumFromHud(HUD_MINUTES, minutes); // Minutes
 			ST_DrawPatchFromHud(HUD_TIMECOLON, sbocolon); // Colon
 			ST_DrawPadNumFromHud(HUD_SECONDS, seconds, 2); // Seconds
-			
+
 			// we should show centiseconds on the intermission screen too, if the conditions are right.
 			if (modeattacking || cv_timetic.value == 2)
 			{