]> 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: 335f6e4 544f1f5)
Merge remote branch 'origin/mirceakitsune/multijump_fix'
authormand1nga <mand1nga@xonotic.org>
Tue, 19 Apr 2011 01:41:08 +0000 (22:41 -0300)
committermand1nga <mand1nga@xonotic.org>
Tue, 19 Apr 2011 01:41:08 +0000 (22:41 -0300)

Trivial merge