aboutsummaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorAnanya Sen2012-02-13 16:19:21 -0800
committerAnanya Sen2012-02-13 16:19:21 -0800
commitb58dafe332fb57210f3d059a518a3d183c222631 (patch)
tree09fd958b0f7f3f51dc88e613e7764bdfc642b742 /assets
parentf3dc624fa464a79fd8e8cec1ddd16ed2109bda23 (diff)
parentf70701db069a10dc5195605fc378a022125b434f (diff)
downloadninja-b58dafe332fb57210f3d059a518a3d183c222631.tar.gz
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Diffstat (limited to 'assets')
-rwxr-xr-xassets/images/irredecentENV.pngbin103121 -> 0 bytes
-rwxr-xr-xassets/images/scales_normal.pngbin113789 -> 0 bytes
-rwxr-xr-xassets/images/stitchStroke.pngbin8054 -> 0 bytes
-rwxr-xr-xassets/images/stitchStroke_N.pngbin2868 -> 0 bytes
-rwxr-xr-xassets/shaders/Basic.vert.glsl2
5 files changed, 1 insertions, 1 deletions
diff --git a/assets/images/irredecentENV.png b/assets/images/irredecentENV.png
deleted file mode 100755
index 21c1c9ce..00000000
--- a/assets/images/irredecentENV.png
+++ /dev/null
Binary files differ
diff --git a/assets/images/scales_normal.png b/assets/images/scales_normal.png
deleted file mode 100755
index 87cc77dc..00000000
--- a/assets/images/scales_normal.png
+++ /dev/null
Binary files differ
diff --git a/assets/images/stitchStroke.png b/assets/images/stitchStroke.png
deleted file mode 100755
index 7808e81f..00000000
--- a/assets/images/stitchStroke.png
+++ /dev/null
Binary files differ
diff --git a/assets/images/stitchStroke_N.png b/assets/images/stitchStroke_N.png
deleted file mode 100755
index 34fa97d4..00000000
--- a/assets/images/stitchStroke_N.png
+++ /dev/null
Binary files differ
diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl
index 028786d1..0d5b8d63 100755
--- a/assets/shaders/Basic.vert.glsl
+++ b/assets/shaders/Basic.vert.glsl
@@ -12,7 +12,7 @@ precision highp float;
12 12
13// attributes 13// attributes
14attribute vec3 a_pos; 14attribute vec3 a_pos;
15 15attribute vec2 texcoord;
16 16
17 17
18// matrix uniforms 18// matrix uniforms