]> de.git.xonotic.org Git - xonotic/netradiant.git/commit
Merge commit 'bf6dd1f2d186c799adf11f1e744a1ff57aa8d335' into garux-merge
authorThomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 19:22:53 +0000 (21:22 +0200)
committerThomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 19:22:53 +0000 (21:22 +0200)
commit84881a66140ad93d0b6cd4d55efbbb459bd91f48
treea511b2bd070c3a20d2abbb4aba041583bc87a731
parent020d0244e4239b21dc804d630edff926386ea34f
parentbf6dd1f2d186c799adf11f1e744a1ff57aa8d335
Merge commit 'bf6dd1f2d186c799adf11f1e744a1ff57aa8d335' into garux-merge
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