Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divVerent@alientrap.org>
Thu, 23 Sep 2010 14:42:36 +0000 (16:42 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Thu, 23 Sep 2010 14:42:36 +0000 (16:42 +0200)
commit65a79fa2676d189418cecfb0ef68676ccb170a6c
tree8f20c646089b91940591915fc4b0536280a47635
parent2421c9cf61aeb5b9902d6f339a1f5e95e7378b9c
parentf3b98d2546556f62cab9491a64cc210defd4b4e7
Merge branch 'master' of ssh://git.xonotic.org/xonotic