Nev3r 9ebb4071ee Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag ... # Conflicts: # src/p_floor.c # src/p_mobj.c # src/p_spec.c # src/r_segs.c		2020-04-25 10:47:45 +02:00
..
conf	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag	2020-04-25 10:47:45 +02:00
wminput.conf	SRB2 2.1 release	2014-03-15 13:11:35 -04:00