aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorJon Reid2012-07-03 13:09:08 -0700
committerJon Reid2012-07-03 13:09:08 -0700
commitb05173c892ebbdb5a7568d3904011ab1bfa695a3 (patch)
tree753d879f92e00dae0124f70807c02b6a8a86dc8d /js/io
parent7e997cac27b4fcb1a30ab53ab5d2114eacfb9222 (diff)
parentd01efeb5918622783f1315136ccdb38f82ad33bb (diff)
downloadninja-b05173c892ebbdb5a7568d3904011ab1bfa695a3.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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