]> de.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: bd9b670 37401b9)
Merge branch 'mirceakitsune/event_chasecam' of ssh://git.xonotic.org/xonotic-data...
authorSamual <samual@xonotic.org>
Fri, 29 Apr 2011 05:39:58 +0000 (01:39 -0400)
committerSamual <samual@xonotic.org>
Fri, 29 Apr 2011 05:39:58 +0000 (01:39 -0400)

Trivial merge