]> 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: aeaeadf abd472a)
Merge remote branch 'origin/mirceakitsune/event_chasecam'
authormand1nga <mand1nga@xonotic.org>
Sat, 30 Apr 2011 13:58:06 +0000 (10:58 -0300)
committermand1nga <mand1nga@xonotic.org>
Sat, 30 Apr 2011 13:58:06 +0000 (10:58 -0300)

Trivial merge