]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
Merge commit '6134b25a1b87ad94c5a082915064a33ea66b07d7' into master-merge
authorThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 04:08:48 +0000 (06:08 +0200)
committerThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 04:08:48 +0000 (06:08 +0200)
1  2 
radiant/build.cpp
radiant/mainframe.cpp
radiant/map.cpp
tools/quake3/q3map2/main.c

Simple merge
Simple merge
diff --cc radiant/map.cpp
Simple merge
Simple merge