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)
commitdaa584caa15991aa216456dddb2b78abbe34d9d3
treeed8865650b333e2818bbc935240094fe45322829
parent6aa642ef010fc792d98f40cdb7dd7cb1fcbbfda7
parentd93ae92b7fae8a1e88e64906cbf01c2bf59b6716
Merge branch 'Melanosuchus/fix_build' into 'master'

Fix compilation

See merge request !36