]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/weapons_fpsfix
authorMario <mario@smbclan.net>
Sun, 10 Jun 2018 09:31:28 +0000 (19:31 +1000)
committerMario <mario@smbclan.net>
Sun, 10 Jun 2018 09:31:28 +0000 (19:31 +1000)
commit83001fad3427e4aca202d07e04639c9b93064f55
tree21139875cc14f8c6f32dc27eefc10f70c77977ae
parentffa308cebc3660cfa790a3dc5c07dc722c67ebbb
parentfb6ec15079507c22d75d7c10967236c362ea99fb
Merge branch 'master' into Mario/weapons_fpsfix
qcsrc/common/weapons/all.qc
qcsrc/server/weapons/weaponsystem.qc
xonotic-client.cfg