mirror of https://github.com/ZDoom/qzdoom.git
Merge branch 'master' into v2.x
Conflicts: src/gl/shaders/gl_shader.cpp
This commit is contained in:
commit
00e4d4e2df
Conflicts: src/gl/shaders/gl_shader.cpp