]> 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: 54ac099 8b6b565)
Merge branch 'master' into cbrutail/darkzone
authorcbrutail <ruszkai.akos@gmail.com>
Sat, 11 Feb 2012 20:53:46 +0000 (21:53 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Sat, 11 Feb 2012 20:53:46 +0000 (21:53 +0100)

Trivial merge