aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorhwc4872012-04-26 13:04:25 -0700
committerhwc4872012-04-26 13:04:25 -0700
commit37f2d5230175c0fb9a4792f5e3d804f7604442e1 (patch)
treec8260f151270c6bdbe08869ebaeb837777c28d1b /js/io
parentf13d0f45f6b449764898e99db309c43b51a33476 (diff)
parent902dc18296fc78f3b8e67d952c42981d926bb2fc (diff)
downloadninja-37f2d5230175c0fb9a4792f5e3d804f7604442e1.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
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 285444b5..e236f2e0 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.7.0.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.7.0.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.4.0"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.5.0"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file