HLSL: Fix merge conflict.

This commit is contained in:
John Kessenich 2016-09-29 10:27:57 -06:00
parent 4e55988a47
commit 21e7e32126
3 changed files with 143 additions and 144 deletions

View file

@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.1525"
#define GLSLANG_DATE "27-Sep-2016"
#define GLSLANG_REVISION "Overload400-PrecQual.1527"
#define GLSLANG_DATE "29-Sep-2016"