]> 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: b618d0e afdbed2)
Merge branch 'master' into diabolik/afterslime
authormand1nga <mand1nga@xonotic.org>
Fri, 8 Apr 2011 21:49:36 +0000 (18:49 -0300)
committermand1nga <mand1nga@xonotic.org>
Fri, 8 Apr 2011 21:49:36 +0000 (18:49 -0300)

Trivial merge