]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into cbrutail/map-breath cbrutail/map-breath
authorcbrutail <ruszkai.akos@gmail.com>
Wed, 25 Sep 2013 17:51:37 +0000 (19:51 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Wed, 25 Sep 2013 17:51:37 +0000 (19:51 +0200)
commit680f308ac4aee142a35642ba46ada7e63792c4e0
treed28a46c67894d35394c40ab0325672bef97d3d0b
parentce31c882b1bab3250cdeb9b55e18e2de6be2f649
parentbd4eebf3a7acdb1f889fb9905175b984201b8008
Merge branch 'master' into cbrutail/map-breath

Merging master into my work branch of Debugger's Breath map.