Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divVerent@alientrap.org>
Tue, 17 Aug 2010 20:04:31 +0000 (22:04 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Tue, 17 Aug 2010 20:04:31 +0000 (22:04 +0200)
commit9f16090cb3dca3aeabf41a275d5d49e4edc0b2e3
tree9432dd1c030ad7561e3447b38559fa43d192ac3d
parentb7bea769376768df209bbe0117ba62999965df81
parentbac383da44b3d8257f60d1a1aebafcb83e878cce
Merge branch 'master' of ssh://git.xonotic.org/xonotic