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)
commit437c7d64f267ade6d1efd8a972d68a6ccb7d42da
tree3527a84d5dccc8bfc7c8550a54a82484fa8c8898
parentca5c25c870df91ef2e54588355d7f2cdab716831
parenta94f2b78482aea0fe826e61349bd857e3797f89f
Merge pull request #913 from dpfoose/develop

Small change to allow compiling with USE_OPENMP on MSVC