Merge pull request #415 from sgbihu/master
authorEric Haszlakiewicz <erh+git@nimenees.com>
Sun, 24 Jun 2018 02:08:25 +0000 (22:08 -0400)
committerGitHub <noreply@github.com>
Sun, 24 Jun 2018 02:08:25 +0000 (22:08 -0400)
Resolve windows name conflict

1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge