HLSL: Fix merge conflict.
authorJohn Kessenich <cepheus@frii.com>
Thu, 29 Sep 2016 16:27:57 +0000 (10:27 -0600)
committerJohn Kessenich <cepheus@frii.com>
Thu, 29 Sep 2016 16:27:57 +0000 (10:27 -0600)
commit21e7e3212646013e46f7c9367c613b1d403677ed
treef3b8e7dbf8ecd6042876a5fae6e47ca11a28412e
parent4e55988a47c1e5922434dc56b2f7a74d06cab1e5
HLSL: Fix merge conflict.
Test/baseResults/hlsl.array.implicit-size.frag.out
Test/hlsl.array.implicit-size.frag
glslang/Include/revision.h