Merge pull request #2291 from akoeplinger/msvc-fixes
authorZoltan Varga <vargaz@gmail.com>
Mon, 7 Dec 2015 01:41:32 +0000 (20:41 -0500)
committerZoltan Varga <vargaz@gmail.com>
Mon, 7 Dec 2015 01:41:32 +0000 (20:41 -0500)
commitd565a22e167bc5a16c734a8a9a4f63c9320b63b2
tree671e57b654c93528b8c07904ac9ecfa677c772ad
parent62c31ed116c4189c7bd6e032514d219d3717647d
parenta51f7d90e54d38fcb621dd0ab8f884bffed29883
Merge pull request #2291 from akoeplinger/msvc-fixes

[msvc] Fix Windows build breaks caused by a595d489fa64d8e213c74470f23c576296e2d548