Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 7 Oct 2010 12:17:54 +0000 (14:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 7 Oct 2010 12:17:54 +0000 (14:17 +0200)
commit868efd45a1a58be8a65461131a551cfa7d9d7dca
tree2ef90857742f5112d787fda98fe9c179b6e3624f
parent82bf17bb85bde1098195939dafcd994613e1b806
parent93a19091517d1519880d80dfc6f2cff960e6ee3a
Merge branch 'master' of ssh://git.xonotic.org/xonotic
all