Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Sun, 14 Aug 2011 14:59:07 +0000 (16:59 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 14 Aug 2011 14:59:07 +0000 (16:59 +0200)
commit76d4fceb1fd14b4ab567db2f91da3e420b883704
tree604edd477586a4595eb35b297af4cd99416713d7
parenta0de257ea138ad309bd499355c780a1961f8fe7b
parenteae69a8930f096fab902b24203caabb46bd3b822
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir