Commit Graph

5 Commits

Author SHA1 Message Date
Neale Pickett adb82e2e5d Merge branch 'master' into stable
Conflicts:
	logos.js
2012-04-16 01:08:27 -06:00
Neale Pickett a0a8d5da5e Add minor threat logo 2012-04-16 01:06:28 -06:00
Neale Pickett 6872d1fc6c logos for doomsdames, tex pistols, pistol whip-hers 2012-04-10 20:47:30 -06:00
Neale Pickett 15272fee2f Optimize for 800x600 2012-03-11 21:31:55 -06:00
Neale Pickett f4c6764f37 reworked logo selection 2011-11-23 21:43:09 -07:00