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 /js/document/templates/app/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 'js/document/templates/app/package.json')
| -rwxr-xr-x | js/document/templates/app/package.json | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/js/document/templates/app/package.json b/js/document/templates/app/package.json new file mode 100755 index 00000000..4f36090a --- /dev/null +++ b/js/document/templates/app/package.json | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | { | ||
| 2 | "directories": { | ||
| 3 | "lib": "" | ||
| 4 | }, | ||
| 5 | "mappings": { | ||
| 6 | "montage": "../../../../node_modules/montage/", | ||
| 7 | "tools": "../../../../node_modules/tools/", | ||
| 8 | "montage-google": "../../../../node_modules/montage-google/" | ||
| 9 | } | ||
| 10 | } \ No newline at end of file | ||