Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Fri, 25 Nov 2011 19:43:33 +0000 (14:43 -0500)
committerSamual <samual@xonotic.org>
Fri, 25 Nov 2011 19:43:33 +0000 (14:43 -0500)
commita68d411f9a130f89964189bae97d43017420d437
tree14ccf5a456fffee5e7df16c1bfc13c1b0fc62d8e
parent4badd300fc3492785f3dc36789b43e52d782beb1
parentc490e6c99eab86ac552d27bb9b13c952846ec989
Merge remote branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg
qcsrc/server/g_world.qc