Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Fri, 23 Dec 2011 15:48:13 +0000 (10:48 -0500)
committerSamual <samual@xonotic.org>
Fri, 23 Dec 2011 15:48:13 +0000 (10:48 -0500)
commit86b0fa45c1e2dc738013683984190744415c1f28
tree4872a9111e9079b73749feb47232a2e5271404a5
parentbcb30bf31a58942eb89829a72b1e76661de7920c
parentc8d05950089f36b4eea93fbcc8e7831f2d71766c
Merge remote branch 'origin/master' into samual/updatecommands

Conflicts:
qcsrc/server/gamecommand.qc
qcsrc/server/command/radarmap.qc
qcsrc/server/g_world.qc