]> 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: dd91bbd 599557a)
Merge branch 'master' into develop
authorMario <mario.mario@y7mail.com>
Sun, 22 Nov 2020 23:19:15 +0000 (09:19 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 22 Nov 2020 23:19:15 +0000 (09:19 +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