]> 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: 950c84e bd3f704)
Merge remote branch 'origin/diabolik/stein1x'
authortzork <jakob_mg@hotmail.com>
Sat, 5 Feb 2011 11:43:41 +0000 (12:43 +0100)
committertzork <jakob_mg@hotmail.com>
Sat, 5 Feb 2011 11:43:41 +0000 (12:43 +0100)

Trivial merge