Merge branch 'master' into public_next

This commit is contained in:
Steel Titanium 2020-02-16 21:00:08 -05:00
commit a6f8db2d44

View file

@ -1261,7 +1261,7 @@ static const char *credits[] = {
"Cody \"SRB2 Playah\" Koester", "Cody \"SRB2 Playah\" Koester",
"Skye \"OmegaVelocity\" Meredith", "Skye \"OmegaVelocity\" Meredith",
"Stephen \"HEDGESMFG\" Moellering", "Stephen \"HEDGESMFG\" Moellering",
"Nick \"ST218\" Molina", "Rosalie \"ST218\" Molina",
"Samuel \"Prime 2.0\" Peters", "Samuel \"Prime 2.0\" Peters",
"Colin \"Sonict\" Pfaff", "Colin \"Sonict\" Pfaff",
"Bill \"Tets\" Reed", "Bill \"Tets\" Reed",