aboutsummaryrefslogtreecommitdiff
path: root/js/io/system
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-21 13:30:51 -0700
committerValerio Virgillito2012-03-21 13:30:51 -0700
commit21a88a93f039bb7470c10d77efc01e549c4ae6dc (patch)
tree44c53c6911b71c1fd749dd733a02cce3d8ce318a /js/io/system
parent3888d7bce9bc9936cad2db4ed6e2f05b87265515 (diff)
parent44b66216531a872f8dba6a11f1cf13c612c90247 (diff)
downloadninja-21a88a93f039bb7470c10d77efc01e549c4ae6dc.tar.gz
Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integration
Diffstat (limited to 'js/io/system')
-rw-r--r--js/io/system/ninjalibrary.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index 00ee7ed2..42505e38 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.6.0.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.7.0.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.1.0"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.1.1"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file