Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 5 Aug 2010 17:31:04 +0000 (19:31 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 5 Aug 2010 17:31:04 +0000 (19:31 +0200)
commit9909604a8d7fc034dd4cf2dca4548527e4bc1403
tree3f56205dac9d4a39cc6269eca81a7d9c64fb35cc
parent850b4c25b61bb114ecb8bed3aef6278f91ce1754
parent6579006248964a9189fe95af4ed28bb6b3724222
Merge branch 'master' of ssh://git.xonotic.org/xonotic