]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into cbrutail/map-fanatic
authorcbrutail <ruszkai.akos@gmail.com>
Sun, 16 Jan 2011 23:43:46 +0000 (00:43 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Sun, 16 Jan 2011 23:43:46 +0000 (00:43 +0100)
commit5859ef379da6696bd9346841678e7a6cd4188318
treec3b4b8405e33417df3dc48856e6d1cdb2735e2e9
parent981655f74f71fb7f1daccbec3963dbc4fbe1bf10
parentaaf74f0c1e947cfd7bffa217b9cef6c5062cfb2d
Merge branch 'master' into cbrutail/map-fanatic