]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commita6e7868a22c8f9e84adc2ce42b5b433c3c26e8c0
treed6275ffc87d0342d0b77d7d396412ae0af4ac898
parent83001fad3427e4aca202d07e04639c9b93064f55
parent1e2c434a190d820b5afad3b8dd5db2a5792eb419
Merge branch 'master' into Mario/weapons_fpsfix
qcsrc/server/weapons/weaponsystem.qc