Commit graph

2 commits

Author SHA1 Message Date
LJ Sonic
59b2764758 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into movie
# Conflicts:
#	.gitlab-ci.yml
#	src/Makefile.d/win32.mk
#	src/Sourcefile
#	src/lua_maplib.c
#	src/r_main.c
2024-01-04 16:25:17 +01:00
Alam Ed Arias
b93cb1b65a SRB2 2.1 release 2014-03-15 13:11:35 -04:00