]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/balance
authorSamual <samual@xonotic.org>
Tue, 1 Nov 2011 18:17:21 +0000 (14:17 -0400)
committerSamual <samual@xonotic.org>
Tue, 1 Nov 2011 18:17:21 +0000 (14:17 -0400)
commitb25f26050ac226793d8ce7fde67341f896504485
tree90df138b5c0fe9f7bd5b497fa7ceedf50f3e3b57
parentd51982782510331bbe81069d3a9f3049a2bbf268
parentccc498662485879227e46dd40bb2d74894db9f33
Merge remote branch 'origin/master' into samual/balance
defaultXonotic.cfg
qcsrc/server/autocvars.qh