Merge branch 'master' into fruitiex/gamemode_freezetag
authorRudolf Polzer <divverent@alientrap.org>
Tue, 16 Nov 2010 21:11:13 +0000 (22:11 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 16 Nov 2010 21:11:13 +0000 (22:11 +0100)
commite8c06bcc965edfdf987c56b025b1e20080403fae
treeed01d8cb94a1a7951cd5d2730c0f3bcc5999dcef
parentc475a5d72330ca7f7c88124f0fc2973c087841cc
parentc4c2c025de52f1b7488c998128ce6445736ae108
Merge branch 'master' into fruitiex/gamemode_freezetag
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/hud.qc
qcsrc/common/util.qc
qcsrc/server/cl_physics.qc