]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Thu, 2 Jun 2011 21:43:38 +0000 (23:43 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Thu, 2 Jun 2011 21:43:38 +0000 (23:43 +0200)
commita792b4ada65da1387e7789646d4f08daeb2c03a6
treed2c4ba455c08558b56709217cde65d1dd409657f
parentdf9031de3f1f45e238215bfbfae830e842b52979
parente40b8b55c6f398339f8c27c95d5bb465bbd44efb
Merge branch 'master' into cbrutail/map-lightspeed