Christoph Oelckers 4a7b1aada7 Merge remote-tracking branch 'remotes/origin/modern' ... # Conflicts: # wadsrc/static/shaders/glsl/main.fp		2018-07-20 10:19:07 +02:00
..
glsl	Merge remote-tracking branch 'remotes/origin/modern'	2018-07-20 10:19:07 +02:00