]> de.git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad36f98 d552313)
Merge branch 'master' into mand1nga/update-docs
authormand1nga <mand1nga@xonotic.org>
Mon, 29 Aug 2011 16:05:53 +0000 (13:05 -0300)
committermand1nga <mand1nga@xonotic.org>
Mon, 29 Aug 2011 16:05:53 +0000 (13:05 -0300)

Trivial merge