]> de.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: 33a800b d886457)
Merge branch 'master' into itsme/vorix
authorItsMe <itsme.xonotic@ymail.com>
Tue, 19 Jul 2011 18:59:53 +0000 (20:59 +0200)
committerItsMe <itsme.xonotic@ymail.com>
Tue, 19 Jul 2011 18:59:53 +0000 (20:59 +0200)

Trivial merge