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)
1  2 
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/hud.qc
qcsrc/common/util.qc
qcsrc/server/cl_physics.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge