]> 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: a89a627 6bd3f80)
Merge remote branch 'origin/mirceakitsune/event_chasecam' into mirceakitsune/event_ch...
authorSamual <samual@xonotic.org>
Thu, 21 Apr 2011 01:33:42 +0000 (21:33 -0400)
committerSamual <samual@xonotic.org>
Thu, 21 Apr 2011 01:33:42 +0000 (21:33 -0400)

Trivial merge