]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/client/_all.qh
Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Mon, 17 Oct 2016 13:37:30 +0000 (23:37 +1000)
committerMario <mario@smbclan.net>
Mon, 17 Oct 2016 13:37:30 +0000 (23:37 +1000)
commit3cc1e9c4a52d70b4d7097a0a584cbb391570c6e2
tree19ccd7ec2cb665a647a2e81ab59e3cba381dc020
parent41caf5737d0d1c43c719672cfdd4f3816ff92765
parentfcc886a800da11731d4b0f576e14b21558b65b5c
Merge branch 'master' into Mario/wepent_experimental
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/physics/player.qc