Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 20:24:04 +0000 (22:24 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 20:24:04 +0000 (22:24 +0200)
commit89cc4b86170eef8332ec4cfbace0205a30882881
treec57c264dcb2a234150359a2f7538d76c575c1fe7
parent3e4cef40c24e8bf7bcd90ca17da082622a4dd1a7
parentb57bc7d55e7badd9c4530274e9b0a6b881d4a302
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir