Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 16:23:56 +0000 (18:23 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 16:23:56 +0000 (18:23 +0200)
commit5255097259873540b4f0a6c88b7d16b138534198
treea23de843e45708ba3c0effb1c906c5d2a25c82f2
parent3b54ba8ef7e7d2f67dce2e829cb331168331bdbe
parentdb9d6f27dc6b064f96524dd7076a5ddbed6ec459
Merge branch 'master' of ssh://git.xonotic.org/xonotic