diff options
| author | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
| commit | 278769df00ced8620fd73371e38fe2e43f07ca3b (patch) | |
| tree | deb505c8a66b660eee1f17a2c6c4c575c7939f6f /js/io/system/ninjalibrary.json | |
| parent | 555fd6efa605b937800b3979a4c68fa7eb8666ae (diff) | |
| parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
| download | ninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/document/models/html.js
js/document/views/design.js
js/ninja.reel/ninja.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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 5c1eb875..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.7.0"} | 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 |