]> 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 | compact (merge: 3e6155c ee10ea0)
Merge remote branch 'origin/master' into divVerent/courtfun2
authorRudolf Polzer <divVerent@xonotic.org>
Sun, 24 Jul 2011 20:35:21 +0000 (22:35 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sun, 24 Jul 2011 20:35:21 +0000 (22:35 +0200)

Trivial merge