Merge branch 'master' into divVerent/csad
authorRudolf Polzer <divverent@xonotic.org>
Wed, 23 Jan 2013 10:32:27 +0000 (11:32 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 23 Jan 2013 10:32:27 +0000 (11:32 +0100)
commit7170086b517c814aa5ea60985993900492c8770a
tree65268b6ce8436813b44e09216fe479796c23702e
parentd227c7dd6f1dd1bfdafd0bdbf4bc3ced5f28535b
parent0e170e3c23403c81bbc004e6134ab4dd5d62b6a1
Merge branch 'master' into divVerent/csad

Conflicts:
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
15 files changed:
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/csqcmodel_hooks.qc
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/csqcmodellib/cl_model.qc
qcsrc/csqcmodellib/interpolate.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/defs.qh
qcsrc/server/g_subs.qc
qcsrc/server/t_jumppads.qc
qcsrc/server/w_electro.qc