]> de.git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2dac234 61214e7)
Merge commit '61214e743288ffe8a58cf7876bd8f7f435397571' into master-merge
authorThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 04:24:13 +0000 (06:24 +0200)
committerThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 04:24:13 +0000 (06:24 +0200)
1  2 
radiant/camwindow.cpp patch | diff1 | diff2 | blob | history
tools/quake3/q3map2/main.c patch | diff1 | diff2 | blob | history

diff --cc radiant/camwindow.cpp
Simple merge
diff --cc tools/quake3/q3map2/main.c
Simple merge