]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/weapons_fpsfix
authorMario <mario@smbclan.net>
Mon, 11 Jun 2018 12:08:47 +0000 (22:08 +1000)
committerMario <mario@smbclan.net>
Mon, 11 Jun 2018 12:08:47 +0000 (22:08 +1000)
1  2 
qcsrc/server/weapons/weaponsystem.qc

Simple merge