]> 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: a0608cd afdbed2)
Merge branch 'master' into itsme/vorix
authorItsMe <itsme.xonotic@ymail.com>
Sat, 9 Apr 2011 09:58:40 +0000 (11:58 +0200)
committerItsMe <itsme.xonotic@ymail.com>
Sat, 9 Apr 2011 09:58:40 +0000 (11:58 +0200)

Trivial merge