]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
Merge commit 'e155ebe99481333af4a7660d174db490e2a75fb5' into master-merge
authorThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 04:18:48 +0000 (06:18 +0200)
committerThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 04:18:48 +0000 (06:18 +0200)
1  2 
radiant/mainframe.cpp
radiant/xywindow.cpp

Simple merge
Simple merge