]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a8fd12 98417b8)
Merge remote-tracking branch 'origin/nifrek/erebusscaled'
authormerlijn <mhofstra@gmail.com>
Wed, 15 Jun 2011 16:24:12 +0000 (18:24 +0200)
committermerlijn <mhofstra@gmail.com>
Wed, 15 Jun 2011 16:24:12 +0000 (18:24 +0200)

Trivial merge