diff options
| author | hwc487 | 2012-06-12 15:52:35 -0700 |
|---|---|---|
| committer | hwc487 | 2012-06-12 15:52:35 -0700 |
| commit | 9490f816924e9e9c9970ef9384241c07ec0a6e9f (patch) | |
| tree | f44449a2e0055e21960a5513fb3a0738a91db528 /js/io/system/ninjalibrary.json | |
| parent | b7a41cbd5a30d32f524ee60e2dfdf9c65c7ec55b (diff) | |
| parent | 6854a72504f57903bd5de003e377f2aefb02d0da (diff) | |
| download | ninja-9490f816924e9e9c9970ef9384241c07ec0a6e9f.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
assets/canvas-runtime.js
js/io/system/ninjalibrary.json
js/mediators/element-mediator.js
Diffstat (limited to 'js/io/system/ninjalibrary.json')
| -rw-r--r-- | js/io/system/ninjalibrary.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json index 5038bd21..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.8.2"} | 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 |