Merge remote-tracking branch 'refs/remotes/origin/opengl'

Conflicts: opengl-test-two/bin/Debug/opengl-test-two.exe opengl-test-two/trimap.fragmentshader
2016-09-04 20:47:28 +02:00
parent 95c58c1abb 260891cbdb
commit 0279e9c3a0
1 changed files with 1 additions and 0 deletions
--- a/opengl-test-two/trimap.fragmentshader
+++ b/opengl-test-two/trimap.fragmentshader
@@ -1,3 +1,4 @@
 #version 330 core
 out vec4 color;