diff options
| author | Ananya Sen | 2012-04-26 12:57:56 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-04-26 12:57:56 -0700 |
| commit | b2132103b12e499f26e6e0f311d48555a9f733ff (patch) | |
| tree | 2eaa000b460e4be3c8050a369318584b2591e8d7 /js/io | |
| parent | 07c611323c109aaa2208ebc15a354b81c3f04a0d (diff) | |
| parent | 902dc18296fc78f3b8e67d952c42981d926bb2fc (diff) | |
| download | ninja-b2132103b12e499f26e6e0f311d48555a9f733ff.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/io')
| -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 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 |