]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into cbrutail/map-arena
authorcbrutail <ruszkai.akos@gmail.com>
Wed, 5 Oct 2011 13:48:10 +0000 (15:48 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Wed, 5 Oct 2011 13:48:10 +0000 (15:48 +0200)
commitd54b44f7f368713f5d51b979ed697a6840996a03
tree64e30adfce7d63fddf353689a28cb960cfd4863c
parent742b686c0e26f07434deabfca0f699276ef7f9b1
parent17bad329e7356d50fc2e6bd2822281e92070461a
Merge branch 'master' into cbrutail/map-arena