diff options
| author | Eric Guzman | 2012-05-17 17:43:05 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-17 17:43:05 -0700 |
| commit | 458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7 (patch) | |
| tree | ee329e409fe28ae54c894b9e27e82e1f85aefc85 /node_modules/montage/package.json | |
| parent | 82954f400f7f8609aef0d2bc1f44c9d960907be6 (diff) | |
| parent | 52394cdd71bd62c8c109fd135fa146b7183fbd1f (diff) | |
| download | ninja-458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7.tar.gz | |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts:
js/document/templates/montage-html/default_html.css
js/lib/NJUtils.js
Diffstat (limited to 'node_modules/montage/package.json')
| -rwxr-xr-x | node_modules/montage/package.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/node_modules/montage/package.json b/node_modules/montage/package.json index ce4b31d5..4e57a257 100755 --- a/node_modules/montage/package.json +++ b/node_modules/montage/package.json | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | "exclude": [ | 9 | "exclude": [ |
| 10 | "lab/benchmarks", | 10 | "lab/benchmarks", |
| 11 | "lab/sandbox", | 11 | "lab/sandbox", |
| 12 | "lab/tools", | ||
| 12 | "examples", | 13 | "examples", |
| 13 | "require/test", | 14 | "require/test", |
| 14 | "require/tests", | 15 | "require/tests", |