]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Fri, 3 Sep 2010 05:52:43 +0000 (07:52 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 3 Sep 2010 05:52:43 +0000 (07:52 +0200)
commite2fa5a6fc3e04ef71f32fd6a55b14d3ac1cd1aa0
tree8b9db66b050e03ba89f8eb5bc1e23db175854326
parent62b04471b783985495eb0455883329cd41817344
parentda92d24ec6fe00597e0b9f1b57e219c4640bb55a
Merge branch 'master' into divVerent/crypto2
defaultXonotic.cfg