]> 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: fc189c1 efa01dd)
Merge remote branch 'origin/samual/defaults/disable_cl_deathfade'
authormand1nga <mand1nga@xonotic.org>
Thu, 21 Apr 2011 23:23:34 +0000 (20:23 -0300)
committermand1nga <mand1nga@xonotic.org>
Thu, 21 Apr 2011 23:23:34 +0000 (20:23 -0300)

Trivial merge