]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Thu, 11 Aug 2011 08:19:14 +0000 (04:19 -0400)
committerSamual <samual@xonotic.org>
Thu, 11 Aug 2011 08:19:14 +0000 (04:19 -0400)
commit5708c1fe15b6deb42a3e3fd7e4ddc1a0e4dbf63c
treed7f72ed7d5bba2a857cf0e6e0c9d61f867c46fe8
parenta35ef4f4b25d299ecca78e4221000bd8afeb5778
parentbbf7625266c11f17acd42a6485689a9e3e0d7ee1
Merge remote branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg