]> de.git.xonotic.org Git - xonotic/netradiant.git/commitdiff
Merge commit 'a255fbd84e64e4f8bb6e6786b6f65579071742b6' into garux-merge
authorThomas Debesse <dev@illwieckz.net>
Mon, 11 Feb 2019 06:38:42 +0000 (07:38 +0100)
committerThomas Debesse <dev@illwieckz.net>
Mon, 11 Feb 2019 06:38:42 +0000 (07:38 +0100)
1  2 
tools/quake3/q3map2/main.c
tools/quake3/q3map2/map.c
tools/quake3/q3map2/shaders.c

Simple merge
Simple merge
Simple merge