stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-04-20 09:11:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge error fix

Browse source
This commit is contained in:
toasterbabe 2017-03-28 19:26:55 +01:00
parent d9f81ee03f
commit 550ecafd15
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/f_finale.c
View file

@ -1002,7 +1002,7 @@ static const char *credits[] = {
"",
"\1Sprite Artists",
"Odi \"Iceman404\" Atunzu",
"Victor \"VAdaPEGA\" Ara\x1Fjo", // Arajo -- sorry for our limited font! D:
"Victor \"VAdaPEGA\" Ara\x1Fjo", // Araújo -- sorry for our limited font! D:
"Jim \"MotorRoach\" DeMello",
"Desmond \"Blade\" DesJardins",
"Sherman \"CoatRack\" DesJardins",
@ -1427,7 +1427,6 @@ void F_StartTitleScreen(void)
if (titlemap)
{
titlemapinaction = true;
titlemapinaction = true;
gamemap = titlemap;