]> de.git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8d29a5 154c708)
Merge commit '154c708c34f241c2369b183ffe9c4296085c5a3c' into master-merge
authorThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 02:03:03 +0000 (04:03 +0200)
committerThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 02:03:03 +0000 (04:03 +0200)
1  2 
radiant/mainframe.h patch | diff1 | diff2 | blob | history
radiant/xywindow.cpp patch | diff1 | diff2 | blob | history

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