]> git.xonotic.org Git - xonotic/netradiant.git/commitdiff
Merge commit '19992696033a496e5c0925e950a29dc23de49b47' into master-merge
authorThomas Debesse <dev@illwieckz.net>
Mon, 20 Jun 2022 02:30:37 +0000 (04:30 +0200)
committerThomas Debesse <dev@illwieckz.net>
Mon, 20 Jun 2022 02:30:37 +0000 (04:30 +0200)
1  2 
tools/quake3/common/scriplib.c
tools/quake3/common/vfs.c
tools/quake3/q3map2/main.c

Simple merge
Simple merge
Simple merge