]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into divVerent/stormkeep-sRGB
authorRudolf Polzer <divverent@xonotic.org>
Thu, 29 Dec 2011 11:42:57 +0000 (12:42 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 29 Dec 2011 11:42:57 +0000 (12:42 +0100)
commit9547e4b3115d972b4b9bba87473112ddd82204a3
treee4b48bc7366a6aa78da439e34010f83500efe68d
parent12820618d9bff9f9d38f24596d3b5d9a49c53999
parentb8b2872fd60b93ea2a03cb10c22adb076686cc2a
Merge branch 'master' into divVerent/stormkeep-sRGB