Merge pull request #1341 from St0fF-NPL-ToM/master
authorJohn Kessenich <johnkslang@users.noreply.github.com>
Tue, 10 Apr 2018 20:16:39 +0000 (14:16 -0600)
committerGitHub <noreply@github.com>
Tue, 10 Apr 2018 20:16:39 +0000 (14:16 -0600)
commitc3a370db1de3283350c68a92ae0d700f774d0e8a
tree0731b3196d2d4cd9c48f316705761176484da100
parent619dc89684097c21f225533325c825bf1d1e700b
parent1aaa3567d98fff5641c4ce450997f87783eaa598
Merge pull request #1341 from St0fF-NPL-ToM/master

fix VS2012 compile issues