Merge branch 'master' into fruitiex/gamemode_freezetag
authorFruitieX <fruitiex@gmail.com>
Wed, 17 Nov 2010 18:54:52 +0000 (20:54 +0200)
committerFruitieX <fruitiex@gmail.com>
Wed, 17 Nov 2010 18:54:52 +0000 (20:54 +0200)
1  2 
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/hud.qc
qcsrc/common/util.qc
qcsrc/menu/xonotic/dialog_multiplayer_create.c
qcsrc/server/cl_physics.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge