Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 6 May 2010 18:17:03 +0000 (20:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 6 May 2010 18:17:03 +0000 (20:17 +0200)
commit623a131a558d528a5ddc58ca580980ef8d4067db
treeef5e5b528d856636b98d6e123693fe05f4d41c73
parent7bb12633412c3c067957b637b2127114e28a22cd
parentff5aed83eb553f8e55c6eb4e2e95b751d1a7b18e
Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic