aboutsummaryrefslogtreecommitdiff
path: root/js/io/system
diff options
context:
space:
mode:
authorJonathan Duran2012-06-25 13:40:37 -0700
committerJonathan Duran2012-06-25 13:40:37 -0700
commit8b46c251664a45039db355075bce85ddfd345269 (patch)
tree0de66b839b0c9107077705ee6f5efe737725207d /js/io/system
parentda3d11366fa6f42a99cbd8998eebd5fe572b76bc (diff)
parent4e5331c9967d4a24df56160188cc916a4051052b (diff)
downloadninja-8b46c251664a45039db355075bce85ddfd345269.tar.gz
Merge branch 'refs/heads/NINJAmaster' into Timeline-bugfix1
Diffstat (limited to 'js/io/system')
-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 0417fa3d..579264cb 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.0.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.2"} 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