]> git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6352fbd 2455e50)
Merge commit '2455e50d724c988a300fe30b8bc66f01bb05dd42' into garux-merge
authorThomas Debesse <dev@illwieckz.net>
Tue, 26 May 2020 14:36:35 +0000 (16:36 +0200)
committerThomas Debesse <dev@illwieckz.net>
Tue, 26 May 2020 14:36:35 +0000 (16:36 +0200)
1  2 
radiant/camwindow.cpp patch | diff1 | diff2 | blob | history
radiant/selection.cpp patch | diff1 | diff2 | blob | history

diff --cc radiant/camwindow.cpp
Simple merge
diff --cc radiant/selection.cpp
Simple merge