]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c53c858 69c459f)
Merge branch 'master' into Mario/melano_osx_winfix
authorMario <mario@smbclan.net>
Thu, 24 Mar 2016 16:56:22 +0000 (02:56 +1000)
committerMario <mario@smbclan.net>
Thu, 24 Mar 2016 16:56:22 +0000 (02:56 +1000)

Trivial merge