aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-27 16:26:53 -0700
committerJose Antonio Marquez2012-06-27 16:26:53 -0700
commit82abdd67e024d668dfb0a7b72ad81e28367b9fd5 (patch)
tree09dc5bdd1d132c2871ff8ec216dc050f93ac516f /js/io
parent4f0104b0120219cbba2e0ac02c7b6aea437dd212 (diff)
parentec438dd0b501296f9aca8fdab7be99e518d7a8fd (diff)
downloadninja-82abdd67e024d668dfb0a7b72ad81e28367b9fd5.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
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 579264cb..c5ccbc82 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.0.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.3"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file