aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-06 14:37:04 -0700
committerValerio Virgillito2012-06-06 14:37:04 -0700
commitbc7ca741f8c8adcb5c5919af6f808a20c37ea5d7 (patch)
tree0e4cf90f47937e7d718d82da1a0d0dab5ac5f136 /js/io
parentfb684fb27c2cef04251655d86e55eceed9da3132 (diff)
parente14ce28b5c8858af75fbf2003c8f1b854daa7e35 (diff)
downloadninja-bc7ca741f8c8adcb5c5919af6f808a20c37ea5d7.tar.gz
Merge branch 'refs/heads/master' into element-model-fixes
Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@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 5c1eb875..e9df5e58 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.10.0.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.10.0.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.7.0"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.9.0"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file