Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Sun, 24 Nov 2013 05:06:24 +0000 (00:06 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 24 Nov 2013 05:06:24 +0000 (00:06 -0500)
commit9029f02a98472212424469b1ea5d73597d41cfe8
treed045d47a22f11ff2df2052c97ab46994e9f59834
parent355f2180774fffd360831b7994b5d9aaa20b510b
parente0ac5f9f14e169a1e19d0e36b85cab061a74ed93
Merge remote-tracking branch 'origin/master' into samual/combined_updates
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/progs.src