]> git.rm.cloudns.org Git - xonotic/xonotic.git/commit
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Sat, 16 Apr 2011 17:05:45 +0000 (19:05 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 16 Apr 2011 17:05:45 +0000 (19:05 +0200)
commitfe07dcce0eccf7d79777794df97f71a994365dbc
tree7082de5d1cb49c83615ae6f24f3069b6e404ed5e
parent1d0b941cc272bbe744c4f54d3d6a8c74a0db5af2
parent601b4f2f14d9db802d97909d0d302457b11e5477
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic