]> de.git.xonotic.org Git - xonotic/netradiant.git/commitdiff
Merge commit 'e744bb6dadcd57fff460b7e6409ecd61bfe272c7' into master-merge
authorThomas Debesse <dev@illwieckz.net>
Mon, 20 Jun 2022 02:26:20 +0000 (04:26 +0200)
committerThomas Debesse <dev@illwieckz.net>
Mon, 20 Jun 2022 02:26:20 +0000 (04:26 +0200)
1  2 
tools/quake3/q3map2/main.c
tools/quake3/q3map2/map.c
tools/quake3/q3map2/shaders.c

Simple merge
Simple merge
Simple merge