aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorKruti Shah2012-06-28 09:24:03 -0700
committerKruti Shah2012-06-28 09:24:03 -0700
commit8aef94d26e172785463161899dfcc877b4233bdb (patch)
treea9d5ff91681aa06bf26cb62994461a58d3f80005 /js/io
parentdeefd070e5e6e793eef2c3d937e7b1a97b0f6830 (diff)
parent299ad041ab8f8669b3688e5ce74df5213d82ade6 (diff)
downloadninja-8aef94d26e172785463161899dfcc877b4233bdb.tar.gz
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
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