]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Wed, 4 Jan 2012 03:56:42 +0000 (22:56 -0500)
committerSamual <samual@xonotic.org>
Wed, 4 Jan 2012 03:56:42 +0000 (22:56 -0500)
1  2 
defaultXonotic.cfg
qcsrc/common/util.qc

Simple merge
Simple merge