]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into cbrutail/map-confusor
authorcbrutail <ruszkai.akos@gmail.com>
Tue, 10 Sep 2013 20:52:37 +0000 (22:52 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Tue, 10 Sep 2013 20:52:37 +0000 (22:52 +0200)
commitba443f49e0b0d6da9cee3266d78d7eaf0ef94c97
tree12222e96c1b189d32bcf1680089a6208f7ad1a15
parent9a951f419bfca61a2903744f1afe8dd60ad1fb49
parentbd4eebf3a7acdb1f889fb9905175b984201b8008
Merge branch 'master' into cbrutail/map-confusor

mergy mergy, maybe worky worky