]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into cbrutail/map-8bit_arena
authorcbrutail <ruszkai.akos@gmail.com>
Sun, 23 Oct 2011 16:27:06 +0000 (18:27 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Sun, 23 Oct 2011 16:27:06 +0000 (18:27 +0200)
commitb7f62617c3912fff42dbc9857cb11371ceb5a422
treead73c694e400a6a272f682ed821af1121450f7d3
parentabf0f618588a6e077059e034780380c63857fd73
parentc131c807aff103eaf48cd8d84b5ff4bd7882aff5
Merge branch 'master' into cbrutail/map-8bit_arena