]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/turrets/turret/walker_weapon.qc
Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Mon, 17 Oct 2016 17:34:09 +0000 (03:34 +1000)
committerMario <mario@smbclan.net>
Mon, 17 Oct 2016 17:34:09 +0000 (03:34 +1000)
commitf4c77946d2b388b2ef4fae1057d1a636d9850923
tree08d53bbd7ffb59246c0625dd687287a083e837ee
parent3cc1e9c4a52d70b4d7097a0a584cbb391570c6e2
parentb9961abee9904e89e1bd80aa93e49e5015d2f010
Merge branch 'master' into Mario/wepent_experimental
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc