Merge branch 'master' into Mario/qc_physics_prehax
authorMario <zacjardine@y7mail.com>
Wed, 15 Jul 2015 05:43:30 +0000 (15:43 +1000)
committerMario <zacjardine@y7mail.com>
Wed, 15 Jul 2015 05:43:30 +0000 (15:43 +1000)
commit777dc5e23d7512c3e33576884d8d200f244d3006
tree53fd60a925e3fa3883694381ad4383d540fc84f7
parentb8018d31cf40eadadfadfad602edd726d137866b
parent1471179ee293a17194be4e25c1e387bd451370a6
Merge branch 'master' into Mario/qc_physics_prehax

Conflicts:
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/g_triggers.qc
qcsrc/server/g_triggers.qh
15 files changed:
defaultXonotic.cfg
qcsrc/client/wall.qh
qcsrc/common/constants.qh
qcsrc/common/physics.qc
qcsrc/common/physics.qh
qcsrc/common/triggers/triggers.qc
qcsrc/common/triggers/triggers.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_physics.qc
qcsrc/server/command/cmd.qc
qcsrc/server/defs.qh
qcsrc/server/g_models.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh