Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Thu, 7 Oct 2010 13:38:43 +0000 (15:38 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 7 Oct 2010 13:38:43 +0000 (15:38 +0200)
commit049a3349de147807768f5b6e89a53c09c5249282
treea1542ef3af1ccbf338d32d842d2f2f9084e5465d
parentc093bf695be4005bc2d26c5782bc46ffa1ef7f26
parentb9bede8374a53ef578aefc574672bf9af982ba8b
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir