Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divVerent@alientrap.org>
Fri, 20 Aug 2010 12:23:07 +0000 (14:23 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Fri, 20 Aug 2010 12:23:07 +0000 (14:23 +0200)
commitc3b65641f6ba82a8e001ab57b5d9117f907e7669
treeb0e0c4d641513d08bedeeb6a8e357508f3fa90eb
parenta675524294f3da80f63b45b69afc2006b779a45f
parent79741c1f709a2e9e7a31a410716af643822d8930
Merge branch 'master' of ssh://git.xonotic.org/xonotic
all