Merge branch 'master' into stable

Conflicts:
	logos.js
This commit is contained in:
Neale Pickett 2012-04-16 01:08:27 -06:00
commit adb82e2e5d
2 changed files with 1 additions and 0 deletions

View File

@ -16,6 +16,7 @@ teams = [
["DD", "doomsdames.png", "Albuquerque Doomsdames"], ["DD", "doomsdames.png", "Albuquerque Doomsdames"],
["TEX", "texpistols.png", "El Paso Tex Pistols"], ["TEX", "texpistols.png", "El Paso Tex Pistols"],
["PWH", "pistol.png", "El Paso Pistol Whip-Hers"], ["PWH", "pistol.png", "El Paso Pistol Whip-Hers"],
["MT", "minorthreat.png", "Minor Threat"],
]; ];
teams.sort(); teams.sort();

BIN
logos/minorthreat.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB