aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-15 20:37:48 -0800
committerJose Antonio Marquez2012-02-15 20:37:48 -0800
commit89b5e793ea88ef235b54b6e1d1c379698d3e612b (patch)
tree4d29118f35df77ca6b423119a4ff61694a442cbf /assets/shaders
parent9d2c2a80483415d7560b00cda5519153db23e241 (diff)
parentd366c0bd1af6471511217ed574083e15059519b5 (diff)
downloadninja-89b5e793ea88ef235b54b6e1d1c379698d3e612b.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'assets/shaders')
-rwxr-xr-x[-rw-r--r--]assets/shaders/Basic.vert.glsl0
-rwxr-xr-x[-rw-r--r--]assets/shaders/linearGradient.frag.glsl0
-rwxr-xr-x[-rw-r--r--]assets/shaders/linearGradient.vert.glsl0
-rwxr-xr-x[-rw-r--r--]assets/shaders/test_fshader.glsl0
-rwxr-xr-x[-rw-r--r--]assets/shaders/test_fshader_full.glsl0
-rwxr-xr-x[-rw-r--r--]assets/shaders/test_vshader.glsl0
-rwxr-xr-x[-rw-r--r--]assets/shaders/ub_fshader.glsl0
-rwxr-xr-x[-rw-r--r--]assets/shaders/ub_vshader.glsl0
8 files changed, 0 insertions, 0 deletions
diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl
index 0d5b8d63..0d5b8d63 100644..100755
--- a/assets/shaders/Basic.vert.glsl
+++ b/assets/shaders/Basic.vert.glsl
diff --git a/assets/shaders/linearGradient.frag.glsl b/assets/shaders/linearGradient.frag.glsl
index 64cf56ff..64cf56ff 100644..100755
--- a/assets/shaders/linearGradient.frag.glsl
+++ b/assets/shaders/linearGradient.frag.glsl
diff --git a/assets/shaders/linearGradient.vert.glsl b/assets/shaders/linearGradient.vert.glsl
index aac9cbee..aac9cbee 100644..100755
--- a/assets/shaders/linearGradient.vert.glsl
+++ b/assets/shaders/linearGradient.vert.glsl
diff --git a/assets/shaders/test_fshader.glsl b/assets/shaders/test_fshader.glsl
index 629d1878..629d1878 100644..100755
--- a/assets/shaders/test_fshader.glsl
+++ b/assets/shaders/test_fshader.glsl
diff --git a/assets/shaders/test_fshader_full.glsl b/assets/shaders/test_fshader_full.glsl
index ef721b39..ef721b39 100644..100755
--- a/assets/shaders/test_fshader_full.glsl
+++ b/assets/shaders/test_fshader_full.glsl
diff --git a/assets/shaders/test_vshader.glsl b/assets/shaders/test_vshader.glsl
index a02d9720..a02d9720 100644..100755
--- a/assets/shaders/test_vshader.glsl
+++ b/assets/shaders/test_vshader.glsl
diff --git a/assets/shaders/ub_fshader.glsl b/assets/shaders/ub_fshader.glsl
index 19a35b7d..19a35b7d 100644..100755
--- a/assets/shaders/ub_fshader.glsl
+++ b/assets/shaders/ub_fshader.glsl
diff --git a/assets/shaders/ub_vshader.glsl b/assets/shaders/ub_vshader.glsl
index ff0c09b4..ff0c09b4 100644..100755
--- a/assets/shaders/ub_vshader.glsl
+++ b/assets/shaders/ub_vshader.glsl