Merge pull request #748 from dgkoch/dgkoch_build_fixes2
authorJohn Kessenich <johnkslang@users.noreply.github.com>
Fri, 3 Mar 2017 16:20:43 +0000 (09:20 -0700)
committerGitHub <noreply@github.com>
Fri, 3 Mar 2017 16:20:43 +0000 (09:20 -0700)
More build fixes

1  2 
hlsl/hlslParseHelper.cpp

Simple merge