]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0cc5bb db64c0e)
Merge branch 'master' into Mario/win64
authorterencehill <piuntn@gmail.com>
Wed, 14 Jun 2017 20:36:12 +0000 (22:36 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 14 Jun 2017 20:36:12 +0000 (22:36 +0200)

Trivial merge