]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3f9630 d08c026)
Merge branch 'master' of ssh://git.xonotic.org/xonotic
authormand1nga <mand1nga@xonotic.org>
Mon, 29 Aug 2011 16:00:59 +0000 (13:00 -0300)
committermand1nga <mand1nga@xonotic.org>
Mon, 29 Aug 2011 16:00:59 +0000 (13:00 -0300)

Trivial merge