]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 981655f aaf74f0)
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)

Trivial merge