]> git.xonotic.org Git - xonotic/xonotic.git/commit
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Tue, 5 Jun 2012 17:10:32 +0000 (19:10 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 5 Jun 2012 17:10:32 +0000 (19:10 +0200)
commitf80e7ddb0e83d74348164bd34dc1224f658c1695
tree1d603dbd2880487ca1b7bf8a395bd20c57948897
parentae49f4945d697ac3c7faa100ea4eef27b544787c
parent2661560c0a9ed6b70c66687c7d75e769447d6cbb
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic