]> 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: 43d21b6 5048c32)
Merge branch 'master' into itsme/tarx
authoritsme <itsme.xonotic@ymail.com>
Mon, 1 Jul 2013 23:33:24 +0000 (01:33 +0200)
committeritsme <itsme.xonotic@ymail.com>
Mon, 1 Jul 2013 23:33:24 +0000 (01:33 +0200)

Trivial merge