]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into cbrutail/map-fanatic cbrutail/map-fanatic
authorcbrutail <ruszkai.akos@gmail.com>
Fri, 19 Apr 2013 21:31:48 +0000 (23:31 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Fri, 19 Apr 2013 21:31:48 +0000 (23:31 +0200)
commit8141099ed9eeecaeb0b0c29f354caa5960f775f0
tree667ec801b84c713bef7d84aa36a2925e6658ee28
parent555563e13c3357474a18f334bc2cb7e95509dde0
parent184b3597b7ae09b128eb15d681324be03fc7acde
Merge branch 'master' into cbrutail/map-fanatic

MErging master, also uploading again (?)