]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'refs/remotes/origin/fruitiex/racefixes'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 20:42:30 +0000 (21:42 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 20:43:07 +0000 (21:43 +0100)
commit4fc59bbd7e2d4f25ba21952ed50ae754295a7faa
tree6e8cb9e055a8a869521b2a57b9dd73e8b32ed56e
parent3024309e2c0576552bfb2da02ba513662c997768
parent797caeb0a822de33e479ea46102ce221cf5cb5a7
Merge remote branch 'refs/remotes/origin/fruitiex/racefixes'

Conflicts:
defaultXonotic.cfg
qcsrc/server/defs.qh
14 files changed:
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/common/util.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/clientcommands.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/gamecommand.qc
qcsrc/server/miscfunctions.qc