]> 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: 8a8f98e a8f17a6)
Merge remote branch 'origin/master' into samual/crosshair_ring_updates
authorSamual <samual@xonotic.org>
Thu, 24 Feb 2011 02:23:21 +0000 (21:23 -0500)
committerSamual <samual@xonotic.org>
Thu, 24 Feb 2011 02:23:21 +0000 (21:23 -0500)

Trivial merge