aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-12 20:59:05 -0700
committerValerio Virgillito2012-06-12 20:59:05 -0700
commitab517ff1061b9494ecc5178e5bc24f1872c9c067 (patch)
tree1c48ef5cc7ae9660ef0da20a6b1516be5ea488cb /js/io
parentadc7c64c862445580b3cb2b76a7f937c0a3f5715 (diff)
parent493485c1ebc4d4034e10b47c161035409e598fcf (diff)
downloadninja-ab517ff1061b9494ecc5178e5bc24f1872c9c067.tar.gz
Merge branch 'refs/heads/master' into montage-v10-integration
Conflicts: js/io/system/ninjalibrary.json 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 e38dd147..fb108937 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.1.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.10.1.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.9.0"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.0"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file