diff options
| author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
| commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
| tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /node_modules/tools/package.json | |
| parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'node_modules/tools/package.json')
| -rwxr-xr-x | node_modules/tools/package.json | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/node_modules/tools/package.json b/node_modules/tools/package.json new file mode 100755 index 00000000..5d830af3 --- /dev/null +++ b/node_modules/tools/package.json | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | |||
| 2 | { | ||
| 3 | "name": "tools", | ||
| 4 | "version": "0.1.0", | ||
| 5 | "description": "Montage Tools", | ||
| 6 | "main": "tools", | ||
| 7 | "mappings": { | ||
| 8 | "montage" : "../montage/" | ||
| 9 | }, | ||
| 10 | "dependency": { | ||
| 11 | "montage" : "0.8" | ||
| 12 | } | ||
| 13 | |||
| 14 | } \ No newline at end of file | ||