aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorJon Reid2012-04-05 16:36:22 -0700
committerJon Reid2012-04-05 16:36:22 -0700
commiteb694fa5d39733264bce7ba832aabbe9c3d6c81e (patch)
tree049aaa66a6621e9f54b33b9861f50c20667ba0e3 /js/io
parenta8ea8f377919c7f1a6af69311f55fd57727d9058 (diff)
parente186c49247689b5c2df6125037e2473636701d17 (diff)
downloadninja-eb694fa5d39733264bce7ba832aabbe9c3d6c81e.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 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