]> 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: 555563e 184b359)
Merge branch 'master' into cbrutail/map-fanatic cbrutail/map-fanatic
authorcbrutail <ruszkai.akos@gmail.com>
Fri, 19 Apr 2013 21:31:48 +0000 (23:31 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Fri, 19 Apr 2013 21:31:48 +0000 (23:31 +0200)
MErging master, also uploading again (?)


Trivial merge