]> git.xonotic.org Git - xonotic/xonotic.git/commit
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Thu, 8 Mar 2012 14:37:14 +0000 (15:37 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 8 Mar 2012 14:37:14 +0000 (15:37 +0100)
commit6feed6f3196d42a3d649e1a6012c15a7c98f911a
treef3884653069a1ed830c4eac9b0c88ba7e860dc1c
parent32db1a9a33a137171f5ab6dbd477e6a8a37c1db4
parent9aaa97f85208aaf0537fca330e06987a08c8c8c7
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic