]> git.xonotic.org Git - xonotic/xonotic.git/commit
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 1 Jun 2011 04:48:03 +0000 (06:48 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 1 Jun 2011 04:48:03 +0000 (06:48 +0200)
commitd1066e479cf8902154984f1d982ff285cd41f80d
tree211a571b41543353839842a4dd2e92cc3f58e844
parent5861689e7d5cf537ff4ec717a0f3033207be3eec
parentc60cc924fff90d82e9340b96ac00b5315e622793
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic