]> 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 | compact (merge: 0f060ee e43e7c5)
Merge remote-tracking branch 'origin/master' into Mario/rainbow_crosshair
authorSamual Lenks <samual@xonotic.org>
Sat, 11 May 2013 23:56:42 +0000 (19:56 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 11 May 2013 23:56:42 +0000 (19:56 -0400)

Trivial merge