]> 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: ed10d65 4978686)
Merge branch 'master' into cbrutail/map-fanatic
authorcbrutail <ruszkai.akos@gmail.com>
Sun, 11 Mar 2012 10:29:03 +0000 (11:29 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Sun, 11 Mar 2012 10:29:03 +0000 (11:29 +0100)

Trivial merge