]> 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: c37c257 e425e4c)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authormand1nga <mand1nga@xonotic.org>
Thu, 18 Aug 2011 20:05:30 +0000 (17:05 -0300)
committermand1nga <mand1nga@xonotic.org>
Thu, 18 Aug 2011 20:05:30 +0000 (17:05 -0300)

Trivial merge