]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/balance
authorSamual <samual@xonotic.org>
Sat, 29 Oct 2011 18:45:18 +0000 (14:45 -0400)
committerSamual <samual@xonotic.org>
Sat, 29 Oct 2011 18:45:18 +0000 (14:45 -0400)
commitd51982782510331bbe81069d3a9f3049a2bbf268
tree4dded49d6e3b40d8f8e8b393aad95b0e8b5a77b7
parentf47067b64a952179ffd345b9be1f540326942913
parentac4cb770422c8abf5dfb33f7c0fcb41604f31b5b
Merge remote branch 'origin/master' into samual/balance
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/server/autocvars.qh