diff options
author | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
commit | 04d89daed90c35a4393773ca2e2d0ac3a4c15cd4 (patch) | |
tree | d0041abc7379ef38b20cce148e5dea6f531b8569 /node_modules/montage/package.json | |
parent | 4d8306b638c53899403a4f0328c02bf1ab893e8f (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-04d89daed90c35a4393773ca2e2d0ac3a4c15cd4.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
.gitignore
js/ninja.reel/ninja.js
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 | } |