]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Thu, 23 Sep 2010 07:56:27 +0000 (09:56 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 23 Sep 2010 07:56:27 +0000 (09:56 +0200)
commit992844fd6e60c81367e690c7bfef86159aefb3b8
treed8ce2ef14f11da4a5e9878d59d97b44fd7a204c5
parent2225edbce26affb2dd74dedd9c4458ef1d661552
parent9041fcca280badb5dfb2a574023f12e374b46f28
Merge remote branch 'origin/master' into divVerent/crypto2
defaultXonotic.cfg