aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorhwc4872012-07-11 10:20:22 -0700
committerhwc4872012-07-11 10:20:22 -0700
commit325cf1dcbd7fc1e1ec6a9ac4829954f7e0ae2afb (patch)
treeb1f12bce35d5281a3a3d47e3cdcbd75d4c498810 /js/io
parent67dd4bdd47a0324507bed232d22068aa198549fe (diff)
parent688e22dc367f37d4b8734a37daa3b823ea450295 (diff)
downloadninja-325cf1dcbd7fc1e1ec6a9ac4829954f7e0ae2afb.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixes
Conflicts: assets/shaders/radialBlur.frag.glsl
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 7f8ee94f..bbf53144 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.2.1"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.2.1"},
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