]> 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: 90e71fa 30e6874)
Merge branches 'master' and 'itsme/vorix' into itsme/vorix
authorItsMe <capbots@live.de>
Sat, 12 Mar 2011 13:19:57 +0000 (14:19 +0100)
committerItsMe <capbots@live.de>
Sat, 12 Mar 2011 13:19:57 +0000 (14:19 +0100)

Trivial merge