Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divVerent@alientrap.org>
Fri, 6 Aug 2010 06:36:35 +0000 (08:36 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Fri, 6 Aug 2010 06:36:35 +0000 (08:36 +0200)
commit977e573f2ff7619d137657bab4fb08ac743202c1
tree3cfbfe16cbc761d5fb9f3ba7cf7807802f7988cb
parente17b0dab5c0e5fe344eadbcb59c58f28e1b9d70a
parent9915810783acd33b98183515f5625aa21f2e3458
Merge branch 'master' of ssh://git.xonotic.org/xonotic