Resolved conflicts

Former-commit-id: 4bd4e4f8435d701d16d3864dd030a6c1cff48c47
2012-12-02 21:49:14 +01:00
parent 6a3087cc26 d0545eb760
commit 780da2cfa5
46 changed files with 1251 additions and 1283 deletions
--- a/examples/bin/shaders/basic.frag
+++ b/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);
 }