]> 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: e38aec8 ed00b09)
Merge remote-tracking branch 'origin/master' into terencehill/screenshot_viewer
authorSamual Lenks <samual@xonotic.org>
Sun, 18 Aug 2013 18:47:02 +0000 (14:47 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 18 Aug 2013 18:47:02 +0000 (14:47 -0400)

Trivial merge