aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-04-04 15:54:33 -0700
committerJose Antonio Marquez2012-04-04 15:54:33 -0700
commita9bcc403df76ad2cb7c31ff7fdd42a85c35cf424 (patch)
tree9415f5ba25ad643df678e561719d2708fd3ead5a /js/io
parent0a469a14757b8cea262c21f652e75c85c9903f4b (diff)
parente721a7c1009f298a1bd8fea583da14535e039880 (diff)
downloadninja-a9bcc403df76ad2cb7c31ff7fdd42a85c35cf424.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
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 29df45b8..285444b5 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.7.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.2"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.4.0"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file