]> 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: 00f45c5 dcccdfb)
Merge remote branch 'origin/samual/devreleaseconfigs'
authormand1nga <mand1nga@xonotic.org>
Sun, 10 Apr 2011 20:52:38 +0000 (17:52 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 10 Apr 2011 20:52:38 +0000 (17:52 -0300)

Trivial merge