]> 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: 3a6107b 4a8aa18)
Merge branch 'master' into divVerent/courtfun2
authorRudolf Polzer <divverent@alientrap.org>
Sun, 12 Sep 2010 14:40:29 +0000 (16:40 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 12 Sep 2010 14:40:29 +0000 (16:40 +0200)

Trivial merge