Merge pull request #1644 from Bradan/development
commit88f0318baa7efef6940b46f11cfa5b7b671f2431
authorAreloch <areloch@gmail.com>
Mon, 20 Jun 2016 02:38:27 +0000 (19 21:38 -0500)
committerGitHub <noreply@github.com>
Mon, 20 Jun 2016 02:38:27 +0000 (19 21:38 -0500)
tree72a14a77f00941f7f9f2fee0bded562c38e3cb7a
parent80dcf3eba588be0be37e88ff33307bdd97690726
parentafcb731d18095cdcd229eb773162e5880a691362
Merge pull request #1644 from Bradan/development

Fixed compile errors on linux (obvious programming faults).