diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /js/io/system/ninjalibrary.json | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/io/system/ninjalibrary.json')
| -rw-r--r-- | js/io/system/ninjalibrary.json | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json new file mode 100644 index 00000000..a61c30d1 --- /dev/null +++ b/js/io/system/ninjalibrary.json | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | { | ||
| 2 | "libraries": [ | ||
| 3 | {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.6.0.0"}, | ||
| 4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.0.1"} | ||
| 5 | ] | ||
| 6 | } \ No newline at end of file | ||