Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Tue, 5 Oct 2010 18:52:07 +0000 (20:52 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 5 Oct 2010 18:52:07 +0000 (20:52 +0200)
commitb73979748bdbb802a65083ea4dd2efabe998ed72
tree5646b2991327265f5562bb86f2e3ad63823121ca
parent92951729552e0e242e4e853472a836f1109494e8
parentfdfbabb54b695574bbb59844ba52f7eac8671d9c
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir