diff options
| author | hwc487 | 2012-04-04 16:32:53 -0700 |
|---|---|---|
| committer | hwc487 | 2012-04-04 16:32:53 -0700 |
| commit | 6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600 (patch) | |
| tree | f267e05f623ed90d1cc841b8c79a338d6d8e807c /js/io/system/ninjalibrary.json | |
| parent | 16f62ca09cc428043e8fef8bdeea11a989e62bc0 (diff) | |
| parent | 17ca01f54591187f5c0812c0fd2cb7260afa9639 (diff) | |
| download | ninja-6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping
Conflicts:
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.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 29df45b8..285444b5 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.1.2"} | 4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.4.0"} |
| 5 | ] | 5 | ] |
| 6 | } \ No newline at end of file | 6 | } \ No newline at end of file |