]> 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: 9037e5f 06ee572)
Merge remote-tracking branch 'origin/master' into samual/orthoview
authorSamual Lenks <samual@xonotic.org>
Sat, 14 Sep 2013 04:30:13 +0000 (00:30 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 14 Sep 2013 04:30:13 +0000 (00:30 -0400)

Trivial merge