]> 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: dff1b86 e7468ae)
Merge branch 'master' into diabolik/strength
authorRudolf Polzer <divverent@alientrap.org>
Sun, 26 Sep 2010 19:20:11 +0000 (21:20 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 26 Sep 2010 19:20:11 +0000 (21:20 +0200)

Trivial merge