]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8746f30 79530f6)
Merge branch 'master' into cbrutail/map-lightspeed_domereplace
authorcbrutail <ruszkai.akos@gmail.com>
Fri, 10 Feb 2012 22:11:29 +0000 (23:11 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Fri, 10 Feb 2012 22:11:29 +0000 (23:11 +0100)

Trivial merge