]> 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: d8525d1 6d47c43)
Merge remote-tracking branch 'origin/diabolik/afterslime'
authormerlijn <mhofstra@gmail.com>
Mon, 23 May 2011 20:04:46 +0000 (22:04 +0200)
committermerlijn <mhofstra@gmail.com>
Mon, 23 May 2011 20:04:46 +0000 (22:04 +0200)

Trivial merge