aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorKruti Shah2012-07-03 15:11:42 -0700
committerKruti Shah2012-07-03 15:11:42 -0700
commit63f1d6ddb28e4e8c4d624e764785c58666ebe5cb (patch)
tree415b48498686136a8d7656a5b836a41de21c97fb /js/io
parent14f30bb927f2cb4a27c81fd6ee4e8d9af46b4404 (diff)
parentfcae5717dab144c4d961b94510aed11d01568345 (diff)
downloadninja-63f1d6ddb28e4e8c4d624e764785c58666ebe5cb.tar.gz
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-RefactorCode
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..86134b97 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.2.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