diff options
| author | John Mayhew | 2012-02-10 16:20:45 -0800 |
|---|---|---|
| committer | John Mayhew | 2012-02-10 16:20:45 -0800 |
| commit | eb0032234971f2c1c471f562d52c086fcffe8a14 (patch) | |
| tree | 9fe9a49b5b49c3c0d15ea4fc124df4c100ffb730 /assets | |
| parent | 730c1e191e36b8ab8dba576c481a6585e0dfa69e (diff) | |
| parent | 344933fd505afb9f5dfa3be8cc959112df04da0a (diff) | |
| download | ninja-eb0032234971f2c1c471f562d52c086fcffe8a14.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/images/irredecentENV.png | bin | 103121 -> 0 bytes | |||
| -rw-r--r-- | assets/images/scales_normal.png | bin | 113789 -> 0 bytes | |||
| -rw-r--r-- | assets/images/stitchStroke.png | bin | 8054 -> 0 bytes | |||
| -rw-r--r-- | assets/images/stitchStroke_N.png | bin | 2868 -> 0 bytes | |||
| -rw-r--r-- | assets/shaders/Basic.vert.glsl | 2 |
5 files changed, 1 insertions, 1 deletions
diff --git a/assets/images/irredecentENV.png b/assets/images/irredecentENV.png deleted file mode 100644 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 100644 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 100644 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 100644 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 100644 --- 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 |
| 14 | attribute vec3 a_pos; | 14 | attribute vec3 a_pos; |
| 15 | 15 | attribute vec2 texcoord; | |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | // matrix uniforms | 18 | // matrix uniforms |
