]> 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: 0f65d82 bd4eebf)
Merge branch 'master' into itsme/tarx
authoritsme <itsme.xonotic@ymail.com>
Thu, 22 Aug 2013 09:56:52 +0000 (11:56 +0200)
committeritsme <itsme.xonotic@ymail.com>
Thu, 22 Aug 2013 09:56:52 +0000 (11:56 +0200)

Trivial merge