]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Fri, 16 Dec 2011 21:05:48 +0000 (16:05 -0500)
committerSamual <samual@xonotic.org>
Fri, 16 Dec 2011 21:05:48 +0000 (16:05 -0500)
commit60c3f5e778bdfd84ee199e4a357fae567c6aaeb2
tree1f4c27c7c263c6d9ac667f06fe230a33566b7b5e
parent59f6701af1d03659b4cc91976ff731178e0afade
parent102a364ffc6c386fcdeb062f7b3e2a66619fb025
Merge remote branch 'origin/master' into samual/updatecommands

Conflicts:
qcsrc/common/util.qc
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/progs.src
qcsrc/common/util.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src