Merge branch 'master' into GL_EXT_shader_implicit_conversions
authorJohn Kessenich <johnkslang@users.noreply.github.com>
Fri, 1 May 2020 05:09:13 +0000 (23:09 -0600)
committerGitHub <noreply@github.com>
Fri, 1 May 2020 05:09:13 +0000 (23:09 -0600)
commit9fcc07872484d352cf5d3721b5bbb5749e7dfc04
tree665320b1c89ad67e829b646ebc317d3d94e4fd6f
parent2a8ead21097ed662ac35a84f13c4b67ef6b6a0a6
parent2c53baedbb64049e15ed8d3b38f867c1d9bec097
Merge branch 'master' into GL_EXT_shader_implicit_conversions
glslang/MachineIndependent/ParseHelper.cpp
glslang/MachineIndependent/Versions.cpp
glslang/MachineIndependent/Versions.h