]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitc5fece79dd031dbfaf29160ef33e537b8d12d818
tree57c6cb29b46910ef99831f855843fd20978da1c3
parentb100e012a72d24db9c8bf50c81519e766d897a20
parentb2737b5c99b7971099ffd2fefb9c8599c69f430b
Merge remote-tracking branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg
qcsrc/common/util.qc