Merge remote branch 'origin/master' into fruitiex/gamemode_freezetag
authorFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 13:56:46 +0000 (15:56 +0200)
committerFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 13:56:46 +0000 (15:56 +0200)
1  2 
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/hud.qc
qcsrc/common/util.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/progs.src
qcsrc/server/w_electro.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge