]> 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: 583298d 695b5cb)
Merge remote-tracking branch 'origin/diabolik/strength' into itsme/strength
authoritsme <itsme.xonotic@ymail.com>
Thu, 5 Jan 2012 22:16:34 +0000 (23:16 +0100)
committeritsme <itsme.xonotic@ymail.com>
Thu, 5 Jan 2012 22:16:34 +0000 (23:16 +0100)

Trivial merge