Commit Graph

2 Commits

Author SHA1 Message Date
SilentSpike
975bc229c6 Merge branch 'master' into ace_spectator
Conflicts:
	addons/spectator/stringtable.xml
2015-07-04 18:53:20 +01:00
Glowbal
49e04ae7bb Added more treatment options and variables to init 2015-02-28 11:41:27 +01:00