]> 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: 5107610 10fec8f)
Merge remote-tracking branch 'origin/diabolik/afterslime'
authormerlijn <mhofstra@gmail.com>
Tue, 14 Jun 2011 06:53:33 +0000 (08:53 +0200)
committermerlijn <mhofstra@gmail.com>
Tue, 14 Jun 2011 06:53:33 +0000 (08:53 +0200)

Trivial merge