]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/cs_clientcvars
authorMario <mario@smbclan.net>
Tue, 18 Jul 2017 13:00:05 +0000 (23:00 +1000)
committerMario <mario@smbclan.net>
Tue, 18 Jul 2017 13:00:05 +0000 (23:00 +1000)
commit926ed1b0236982412cf330acad1298e0581e4e6e
treefc4df12986b4ee62d69754ca54e37adbbb2bbf27
parent17a60e212b2b478f1a612a057af6fcc86ef97e88
parent8a17bac4268551bf8bf1400b13ddc4eb2d30fa76
Merge branch 'master' into Mario/cs_clientcvars

# Conflicts:
# qcsrc/common/state.qc
# qcsrc/server/client.qh
qcsrc/common/physics/player.qc
qcsrc/common/playerstats.qc
qcsrc/common/state.qc
qcsrc/common/stats.qh
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/player.qc
qcsrc/server/weapons/accuracy.qc
qcsrc/server/weapons/selection.qc