Merge branch 'master' into GL_EXT_blend_func_extended
authorJohn Kessenich <johnkslang@users.noreply.github.com>
Fri, 1 May 2020 08:41:31 +0000 (02:41 -0600)
committerGitHub <noreply@github.com>
Fri, 1 May 2020 08:41:31 +0000 (02:41 -0600)
commit7c4dc1299e4efc38f3e14cec077b02d242016c02
tree7358ac3bc39f9662db03dc100d858b67b0a738f6
parente05cc20ec20a154d94256c744a3837c23719c0f9
parentc2fd3003a3626c1b749f99a36fa38282907082a0
Merge branch 'master' into GL_EXT_blend_func_extended
glslang/MachineIndependent/ParseHelper.cpp
glslang/MachineIndependent/Versions.cpp
glslang/MachineIndependent/Versions.h