]> git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0908af4 70b21ea)
Merge commit '70b21eafbe10c90172922d8a7af4f06b9a3b242d' into master-merge
authorThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 02:04:34 +0000 (04:04 +0200)
committerThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 02:04:34 +0000 (04:04 +0200)
1  2 
radiant/brush.h patch | diff1 | diff2 | blob | history
radiant/csg.cpp patch | diff1 | diff2 | blob | history

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