aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-10 10:45:22 -0700
committerValerio Virgillito2012-07-10 10:45:22 -0700
commitcfb2f95cffd22d5da2694639a8f2f67baf417adc (patch)
tree9250e86f03cf432fd58486accc8e05497e9a40de /js/io
parentb2b1d24d6c5741f7cd6e920edfe8781aa9efce1b (diff)
downloadninja-cfb2f95cffd22d5da2694639a8f2f67baf417adc.tar.gz
Removed the shaders that we do not have rights to.
Conflicts: js/io/system/ninjalibrary.json js/models/materials-model.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/io')
-rw-r--r--js/io/system/ninjalibrary.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index c5ccbc82..55079e45 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
1{ 1{
2 "libraries": [ 2 "libraries": [
3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.1.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.1.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.4"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file