]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f624a3 131db00)
Merge branch 'master' into drjaska/demohooks
authordrjaska <drjaska83@gmail.com>
Sun, 7 Jan 2024 22:10:13 +0000 (00:10 +0200)
committerdrjaska <drjaska83@gmail.com>
Sun, 7 Jan 2024 22:10:13 +0000 (00:10 +0200)
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