Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir into cbrut...
authorcbrutail <ruszkai.akos@gmail.com>
Mon, 1 Nov 2010 14:32:14 +0000 (15:32 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Mon, 1 Nov 2010 14:32:14 +0000 (15:32 +0100)
commit16b9504ddb857490a3e0407cbe797c89a04c1007
treebd50fc84877e1826c3e0a6db55a3b0a5d1346d2d
parent5720f32a21ba51ec254ba08c72bcf1a0451d1073
parent2a894757eae152b20734b24a2f9faed3fb656440
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir into cbrutail/map-lightspeed