diff options
author | Jon Reid | 2012-04-26 13:13:17 -0700 |
---|---|---|
committer | Jon Reid | 2012-04-26 13:13:17 -0700 |
commit | ddbc1ac7eb35fee9254f4842fe29ab35de3d214c (patch) | |
tree | 3cfacd0f4714e929584e7bb915dfd3613fb74226 /js/io/system | |
parent | 47e63e06fe01a1d66d3909b5f6acc0d987f97d9d (diff) | |
parent | 53eba0fe1bd27396a8b7cb7828e51457d8d9576a (diff) | |
download | ninja-ddbc1ac7eb35fee9254f4842fe29ab35de3d214c.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/io/system')
-rw-r--r-- | js/io/system/ninjalibrary.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json index 285444b5..e236f2e0 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.4.0"} | 4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.5.0"} |
5 | ] | 5 | ] |
6 | } \ No newline at end of file | 6 | } \ No newline at end of file |