Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Fri, 17 Sep 2010 19:18:39 +0000 (21:18 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 17 Sep 2010 19:18:39 +0000 (21:18 +0200)
commit85dfd7134e95b1a66c0720b34ed0a13cecb8ffee
treef864be5dab0e1b59ea1dc0eda03b9591330a228d
parentdba1c3b18f81cebba31f8938eeb4a0ccc30a43f1
parent64a00f88fef521af988751f300b4b485e58de938
Merge branch 'master' of ssh://git.xonotic.org/xonotic