]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7763cb 09b97bb)
Merge commit '09b97bb415e380e5eaf6e2f4acbdc7f740494b41' into garux-merge
authorThomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 18:20:45 +0000 (20:20 +0200)
committerThomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 18:20:45 +0000 (20:20 +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