Merge pull request #913 from dpfoose/develop
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 27 Jun 2016 14:05:30 +0000 (10:05 -0400)
committerGitHub <noreply@github.com>
Mon, 27 Jun 2016 14:05:30 +0000 (10:05 -0400)
Small change to allow compiling with USE_OPENMP on MSVC


Trivial merge