]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4bfb74 7694d3a)
Merge branch 'master' into develop
authorbones_was_here <bones_was_here@xa.org.au>
Thu, 2 Jun 2022 02:25:34 +0000 (12:25 +1000)
committerbones_was_here <bones_was_here@xa.org.au>
Thu, 2 Jun 2022 02:25:34 +0000 (12:25 +1000)
1  2 
qcsrc/client/main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/main.qc
Simple merge
diff --cc qcsrc/client/view.qc
Simple merge