aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorJonathan Duran2012-07-20 08:30:24 -0700
committerJonathan Duran2012-07-20 08:30:24 -0700
commit936fbd6d76d35e3f9574983682c266de6dce55f7 (patch)
treeedfbd366df9d7e7514425561a817fc2c67f398d9 /js/io
parent7b7f4157dfd1d3ad2b4a266c92594da56a619254 (diff)
parent9053e2037821a5c8405fabb74db9635deacfe8d5 (diff)
downloadninja-936fbd6d76d35e3f9574983682c266de6dce55f7.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com>
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 bbf53144..6b74b04f 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.2.1"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.2.1"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.4"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.5"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file