Commit graph

6 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
8f00667abe Update src/Makefile.d/*.mk
both Makefile and *.mk should be in the same EOL
2023-10-13 20:18:37 -04:00
Alam Ed Arias
92779487a4 avoid the source code from getting the wrong EOL 2019-09-20 12:32:18 -04:00
Alam Ed Arias
f3d0ecbe9d gitattributes: do not check whitespace for included libs 2016-05-18 10:38:29 -04:00
Alam Ed Arias
21c30a396c appveyor: allow one to RDP to system to debug build system 2016-01-27 00:11:54 -05:00
Alam Ed Arias
b93cb1b65a SRB2 2.1 release 2014-03-15 13:11:35 -04:00