]> git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca0295d e155ebe)
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 patch | diff1 | diff2 | blob | history
radiant/xywindow.cpp patch | diff1 | diff2 | blob | history

diff --cc radiant/mainframe.cpp
Simple merge
diff --cc radiant/xywindow.cpp
Simple merge