Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 17 Jun 2010 07:20:48 +0000 (09:20 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 17 Jun 2010 07:20:48 +0000 (09:20 +0200)
commit7e147c7e326b0d218600e590f6289f18bbe93f19
treefc8645dfb6d36c60113c41d5367c248259095de5
parent18313a24adbb50a33ea6f67aae9822c9cd05e8d9
parent76666d324695939297e0e86a1711abd386d227cc
Merge branch 'master' of ssh://git.xonotic.org/xonotic
all