]> de.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: b411d98 7623f63)
Merge branch 'master' into Mario/qc_camstuff
authorMario <mario@smbclan.net>
Wed, 28 Aug 2019 10:27:11 +0000 (20:27 +1000)
committerMario <mario@smbclan.net>
Wed, 28 Aug 2019 10:27:11 +0000 (20:27 +1000)
1  2 
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history

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