]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/warpzonefix
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 9 Feb 2015 12:19:13 +0000 (13:19 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 9 Feb 2015 12:19:13 +0000 (13:19 +0100)
commit269c35716ba46b793f9ec595107e646f2c1b605e
treea06d41334476f7ae3309998b050e3c7e20a4256b
parent70f6e172a11cd7496de8c254dbf228baec1a743f
parentf2c50fe4e6218a0a1bb0ca078ee122c5ba6a238d
Merge branch 'master' into divVerent/warpzonefix

Conflicts:
qcsrc/client/autocvars.qh
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/warpzonelib/anglestransform.qc
qcsrc/warpzonelib/client.qc
qcsrc/warpzonelib/common.qc
qcsrc/warpzonelib/server.qc
12 files changed:
qcsrc/client/autocvars.qh
qcsrc/client/view.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/warpzonelib/anglestransform.qc
qcsrc/warpzonelib/anglestransform.qh
qcsrc/warpzonelib/client.qc
qcsrc/warpzonelib/common.qc
qcsrc/warpzonelib/common.qh
qcsrc/warpzonelib/server.qc