]> git.xonotic.org Git - xonotic/netradiant.git/commitdiff
Merge commit 'fa294e421503ea26846c4f4c3420f5e47a837510' into garux-merge
authorThomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 18:29:09 +0000 (20:29 +0200)
committerThomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 18:29:09 +0000 (20:29 +0200)
1  2 
radiant/brush.h
radiant/csg.cpp
radiant/selection.cpp

diff --cc radiant/brush.h
Simple merge
diff --cc radiant/csg.cpp
Simple merge
Simple merge