]> 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: 1c3b3ad 99aa061)
Merge branch 'master' into develop
authorMario <mario.mario@y7mail.com>
Sat, 7 Nov 2020 05:09:04 +0000 (15:09 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 7 Nov 2020 05:09:04 +0000 (15:09 +1000)
1  2 
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history

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