]> 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: e43e7c5 9ecb13e)
Merge remote-tracking branch 'origin/Mario/rainbow_crosshair'
authorSamual Lenks <samual@xonotic.org>
Sun, 12 May 2013 00:49:55 +0000 (20:49 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 12 May 2013 00:49:55 +0000 (20:49 -0400)

Trivial merge