Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Thu, 29 Dec 2011 15:16:04 +0000 (10:16 -0500)
committerSamual <samual@xonotic.org>
Thu, 29 Dec 2011 15:16:04 +0000 (10:16 -0500)
commit24f6d013a268851d6584e3f76ac0c0308f737b6f
tree231fd712f51d860c2dacb3e2ec87cdcf628c5ce1
parent8b1ab877875ae26e00be88798f9d131dd8e9f601
parenta343ce0ad217507040ef083c89b7e07a2b01f917
Merge remote branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/scoreboard.qc
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/sv_main.qc