Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Thu, 18 Nov 2010 06:58:35 +0000 (01:58 -0500)
committerunknown <samual@xonotic.org>
Thu, 18 Nov 2010 06:58:35 +0000 (01:58 -0500)
commit7c62768eab4fee3b2b0281afded2d17abd246da4
treed81b97557642f73895d77bafc1feb8529259f051
parente791dfcea72312a571a9a551221585786bd80e31
parentd322b466ecbb228eb52a863aec00aa6c9321af95
Merge remote branch 'origin/master' into samual/keepaway
defaultXonotic.cfg
qcsrc/common/constants.qh
qcsrc/server/defs.qh
qcsrc/server/g_world.qc