Merge remote branch 'origin/master' into fruitiex/gamemode_freezetag
authorFruitieX <fruitiex@gmail.com>
Wed, 24 Nov 2010 19:44:41 +0000 (21:44 +0200)
committerFruitieX <fruitiex@gmail.com>
Wed, 24 Nov 2010 19:44:41 +0000 (21:44 +0200)
commit136bde75f76430926f45692fc783f12f053c3b1e
tree7a2eea5da72dc2fa5e87ef598b821146448ebb31
parent526256220aa1c46ff61799f2ca68a33b1451b503
parentc91f592638f0707cac8a8966b0c79149abb17fa4
Merge remote branch 'origin/master' into fruitiex/gamemode_freezetag

Conflicts:
defaultXonotic.cfg
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/server/cl_physics.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/progs.src