diff options
author | Valerio Virgillito | 2012-02-15 16:09:47 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-15 16:09:47 -0800 |
commit | d366c0bd1af6471511217ed574083e15059519b5 (patch) | |
tree | c8c9f9af761457e3c5f4c6774fb0fbba851df0c4 /assets/shaders | |
parent | 997ce3fb65f27b3d6f331f63b5dc22d3c7fb8f1e (diff) | |
parent | b85bfb54aaca3ccca3c1ef09115de925cd67f4e9 (diff) | |
download | ninja-d366c0bd1af6471511217ed574083e15059519b5.tar.gz |
Merge branch 'refs/heads/integration'
Diffstat (limited to 'assets/shaders')
-rwxr-xr-x[-rw-r--r--] | assets/shaders/Basic.vert.glsl | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | assets/shaders/linearGradient.frag.glsl | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | assets/shaders/linearGradient.vert.glsl | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | assets/shaders/test_fshader.glsl | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | assets/shaders/test_fshader_full.glsl | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | assets/shaders/test_vshader.glsl | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | assets/shaders/ub_fshader.glsl | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | assets/shaders/ub_vshader.glsl | 0 |
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 | |||