diff options
author | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
commit | e6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch) | |
tree | 39846bf1570f9b5a4057b726c54905de9e9e1c02 /node_modules/montage/package.json | |
parent | 7950424cf704bb221971f4645406b01e6979db18 (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz |
Merge branch 'master' into components
Conflicts:
node_modules/montage/ui/bluemoon/progress.reel/progress.html
node_modules/montage/ui/image2.reel/image2.html
node_modules/ninja-components/effect/desaturate-effect.js
node_modules/ninja-components/effect/effect.js
node_modules/ninja-components/effect/invert-effect.js
node_modules/ninja-components/effect/kaliedoscope-effect.js
node_modules/ninja-components/effect/multiply-effect.js
node_modules/ninja-components/effect/sepia-effect.js
node_modules/ninja-components/flow-controller.reel/flow-controller.html
node_modules/ninja-components/flow-controller.reel/flow-controller.js
node_modules/ninja-components/flow-offset.js
node_modules/ninja-components/hottext.reel/hottext.css
node_modules/ninja-components/hottext.reel/hottext.html
node_modules/ninja-components/hottext.reel/hottext.js
node_modules/ninja-components/hottextunit.reel/hottextunit.css
node_modules/ninja-components/hottextunit.reel/hottextunit.html
node_modules/ninja-components/hottextunit.reel/hottextunit.js
node_modules/ninja-components/image2.reel/image2.html
node_modules/ninja-components/image2.reel/image2.js
node_modules/ninja-components/image3d.reel/image3d.html
node_modules/ninja-components/image3d.reel/image3d.js
node_modules/ninja-components/photo-editor.reel/photo-editor.css
node_modules/ninja-components/photo-editor.reel/photo-editor.html
node_modules/ninja-components/photo-editor.reel/photo-editor.js
node_modules/ninja-components/slider-base.js
user-document-templates/montage-application-cloud/appdelegate.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/package.json')
-rwxr-xr-x | node_modules/montage/package.json | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/node_modules/montage/package.json b/node_modules/montage/package.json index 299857f7..6cc0c079 100755 --- a/node_modules/montage/package.json +++ b/node_modules/montage/package.json | |||
@@ -2,14 +2,23 @@ | |||
2 | "name": "montage", | 2 | "name": "montage", |
3 | "version": "0.3.1", | 3 | "version": "0.3.1", |
4 | "description": "A UI Framework", | 4 | "description": "A UI Framework", |
5 | "main": "core/core.js", | 5 | "main": "montage", |
6 | "exclude": [ | 6 | "exclude": [ |
7 | "lab/benchmarks", | 7 | "lab/benchmarks", |
8 | "lab/sandbox", | 8 | "lab/sandbox", |
9 | "examples", | 9 | "examples", |
10 | "require/test", | 10 | "require/test", |
11 | "require/tests" | 11 | "require/tests", |
12 | "etc" | ||
12 | ], | 13 | ], |
14 | "overlay": { | ||
15 | "montage": { | ||
16 | "main": "core/core" | ||
17 | } | ||
18 | }, | ||
19 | "bin": { | ||
20 | "montage": "bin/montage" | ||
21 | }, | ||
13 | "devDependencies": { | 22 | "devDependencies": { |
14 | "test": ">=0.2.1" | 23 | "test": ">=0.2.1" |
15 | } | 24 | } |