aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorhwc4872012-06-13 10:17:07 -0700
committerhwc4872012-06-13 10:17:07 -0700
commiteea0703ca3b7f066a9d685ce09905d4860fa082d (patch)
treef0000ae8469a9e551f629c744251e6a688bbec4c /js/io
parent1fe66f1a89ac949dee44ae881556901a8bf98bba (diff)
parent5a7774f6769a7a682e21bafe0e57007668f16153 (diff)
downloadninja-eea0703ca3b7f066a9d685ce09905d4860fa082d.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/io/system/ninjalibrary.json
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 b18e1950..03753da9 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.9.1"} 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