Resolved conflicts

Former-commit-id: 4bd4e4f8435d701d16d3864dd030a6c1cff48c47

examples/bin/shaders/basic.frag

@@ -2,9 +2,9 @@
 
 varying vec2 TexCoord;
 
-uniform sampler2D texture;
+uniform sampler2D diffuseMap;
 
 void main()
 {
-	gl_FragColor = texture2D(texture, TexCoord);
+	gl_FragColor = texture2D(diffuseMap, TexCoord);
 }