Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next

This commit is contained in:
Inuyasha 2016-05-05 02:32:29 -07:00
commit cd877fea1f

View file

@ -1008,6 +1008,7 @@ static const char *credits[] = {
"\1Texture Artists", "\1Texture Artists",
"Ryan \"Blaze Hedgehog\" Bloom", "Ryan \"Blaze Hedgehog\" Bloom",
"Buddy \"KinkaJoy\" Fischer", "Buddy \"KinkaJoy\" Fischer",
"Vivian \"toaster\" Grannell",
"Kepa \"Nev3r\" Iceta", "Kepa \"Nev3r\" Iceta",
"Jarrett \"JEV3\" Voight", "Jarrett \"JEV3\" Voight",
"", "",