Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Sun, 21 Aug 2011 17:22:57 +0000 (19:22 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 21 Aug 2011 17:22:57 +0000 (19:22 +0200)
commit8278ebf65b5d685d2e8ae7a429d21f3a24e1e439
tree00f5b5ccafeca21c87daf6051799ee760e7d6898
parent85de9e3f6bc813eadcb3f15a3a9b43f3b4a3fb7d
parentd08987df837374ea86077e0dccf0121c42865ccc
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir