projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c331d4c 9b55b71)
Merge branch 'master' into itsme/vorix
authorItsMe <itsme.xonotic@ymail.com>
Tue, 21 Jun 2011 23:06:06 +0000 (01:06 +0200)
committerItsMe <itsme.xonotic@ymail.com>
Tue, 21 Jun 2011 23:06:06 +0000 (01:06 +0200)

Trivial merge