toaster f2596ab0bb Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks ... # Conflicts: # extras/conf/SRB2-22.cfg		2019-10-25 20:32:15 +01:00
..
conf	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks	2019-10-25 20:32:15 +01:00
wminput.conf	SRB2 2.1 release	2014-03-15 13:11:35 -04:00