Merge pull request #808 from theoractice/develop
authorZhang Xianyi <traits.zhang@gmail.com>
Sun, 20 Mar 2016 13:07:47 +0000 (09:07 -0400)
committerZhang Xianyi <traits.zhang@gmail.com>
Sun, 20 Mar 2016 13:07:47 +0000 (09:07 -0400)
Fix a minor compiler error in VisualStudio with CMake


Trivial merge