aboutsummaryrefslogtreecommitdiff
path: root/js/io/system
diff options
context:
space:
mode:
authorJonathan Duran2012-07-03 11:56:26 -0700
committerJonathan Duran2012-07-03 11:56:26 -0700
commit0771c013abc4389913ff6cebf1ae6408000d50e6 (patch)
tree1160a274ac8f51aa908b6e5f7f74a2ccbe95d932 /js/io/system
parent9cd3ae740b67e192f06ee000eba759ca68bdea52 (diff)
parentfcae5717dab144c4d961b94510aed11d01568345 (diff)
downloadninja-0771c013abc4389913ff6cebf1ae6408000d50e6.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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 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