Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir into cbrut...
authorcbrutail <ruszkai.akos@gmail.com>
Mon, 1 Nov 2010 14:09:29 +0000 (15:09 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Mon, 1 Nov 2010 14:09:29 +0000 (15:09 +0100)
commit0ff463dde127cf7adac769435d08692b9f229619
tree81ceb4555d3213404db4eadfe7385920db4912d8
parent20b8f836552c9db1a02beaaf576637bb2a07452b
parentaadc7ce360f266135da544f7c10c62fffd6f8162
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir into cbrutail/map-lightspeed