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)
commit21a6985a5568f9ade821c914c5d66595ddc4619d
tree42c5cd8685f31643775060b0fa4f29d541c8466f
parentc475a5d72330ca7f7c88124f0fc2973c087841cc
parent9de5005504c0c133167f6c122da1d5deb5172963
Merge branch 'master' into fruitiex/gamemode_freezetag
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