Merge branch 'samual/keepaway' into fruitiex/freezetag_vs_keepaway
authorFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 14:51:41 +0000 (16:51 +0200)
committerFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 14:51:41 +0000 (16:51 +0200)
commit84de176ec42eeaeaa7f9b415b0f2b67adb1aa708
treeb68a35059bf9ad418494ded98e39b6cf64e3d645
parentaa09855edb4f5a7520f536fc54ce2502e3a398e5
parentcbd704027b098da73f32298f43a1ecbc95e485d2
Merge branch 'samual/keepaway' into fruitiex/freezetag_vs_keepaway

Conflicts:
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/common/util.qc
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
qcsrc/server/defs.qh
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/teamplay.qc
16 files changed:
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/common/util.qc
qcsrc/menu/xonotic/dialog_multiplayer_create.c
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/teamplay.qc