]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into divVerent/stormkeep-sRGB
authorRudolf Polzer <divverent@xonotic.org>
Tue, 27 Dec 2011 14:27:39 +0000 (15:27 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 27 Dec 2011 14:27:39 +0000 (15:27 +0100)
commit45a7899845fd9c58605461411a51510857f21eb8
tree4ba041d3273629053a84640feda36ca3a0ea2aaf
parent127f1283857e86d4e7d75671b339b3cfbdc486fa
parent087d5ca9699b5d39e77ffab0e4d2ed8cad0dac79
Merge branch 'master' into divVerent/stormkeep-sRGB
maps/stormkeep.map.options