]> git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20dbf5c 02a5189)
Merge branch 'master' into Mario/winfix
authorMario <mario@smbclan.net>
Sun, 29 Apr 2018 14:01:55 +0000 (00:01 +1000)
committerMario <mario@smbclan.net>
Sun, 29 Apr 2018 14:01:55 +0000 (00:01 +1000)

Trivial merge