aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders
diff options
context:
space:
mode:
authorEric Guzman2012-02-16 00:22:43 -0800
committerEric Guzman2012-02-16 00:22:43 -0800
commit82b1a273219f0ae3d119e156c7acccdbe478f441 (patch)
tree74c45e5e3afc6706b2f7a7918807f72c54cdcfc5 /assets/shaders
parentaf20ca9b11133dd5cefb9275dbe8fb101c3380d0 (diff)
parent966f0adaf1d4b7f2dd5a6e31643df58bff713884 (diff)
downloadninja-82b1a273219f0ae3d119e156c7acccdbe478f441.tar.gz
Merge branch 'refs/heads/TreeComponents' into PresetsPanel
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