]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd6c3d7 435f904)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authormand1nga <mand1nga@xonotic.org>
Sun, 21 Aug 2011 05:49:40 +0000 (02:49 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 21 Aug 2011 05:49:40 +0000 (02:49 -0300)

Trivial merge