]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8847a91 014a5cf)
Merge branch 'master' into Mario/win64
authorterencehill <piuntn@gmail.com>
Mon, 28 Aug 2017 13:11:00 +0000 (15:11 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 28 Aug 2017 13:11:00 +0000 (15:11 +0200)

Trivial merge