]> git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6aa642e d93ae92)
Merge branch 'Melanosuchus/fix_build' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 12 Mar 2017 19:42:42 +0000 (19:42 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 12 Mar 2017 19:42:42 +0000 (19:42 +0000)
Fix compilation

See merge request !36


Trivial merge