Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 5 Aug 2010 08:41:38 +0000 (10:41 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 5 Aug 2010 08:41:38 +0000 (10:41 +0200)
commitd8d1cd7183a8cd18961fd4f36b38429e0a31327d
treefaef6b334306c11dac5f15169846ad155e0ca19e
parentb1b11781306aaeb3549aed3fc179eafa641cecf0
parent8d86e11354671e3e1f5a628998f23193f82ee802
Merge branch 'master' of ssh://git.xonotic.org/xonotic
all