Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Mon, 29 Nov 2010 08:07:01 +0000 (03:07 -0500)
committerunknown <samual@xonotic.org>
Mon, 29 Nov 2010 08:07:01 +0000 (03:07 -0500)
commit5ad3d2aadbd5aa4fe80008df07e1f396ca1c832a
tree01e789857c268d1c149ae96bd3ae12b72d3218eb
parent2c022461b9a9a44b84dbf8fd1b8b3063b5160141
parent2414c632b73268944cd9072cbf3190e4d926290f
Merge remote branch 'origin/master' into samual/keepaway
defaultXonotic.cfg
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