]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
Merge commit '84881a66140ad93d0b6cd4d55efbbb459bd91f48' into master-merge
authorThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 02:22:18 +0000 (04:22 +0200)
committerThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 02:22:18 +0000 (04:22 +0200)
1  2 
tools/quake3/common/scriplib.c
tools/quake3/common/vfs.c
tools/quake3/common/vfs.h
tools/quake3/q3map2/bspfile_abstract.c
tools/quake3/q3map2/main.c
tools/quake3/q3map2/shaders.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge