diff options
author | Valerio Virgillito | 2012-05-16 16:06:56 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-16 16:06:56 -0700 |
commit | 92fcb770aff434e994e7a39a61d8fac4a017dca0 (patch) | |
tree | e385beee8f2694596f6305bf90eb7eb4521de2e2 /js/document/templates/montage-html/package.json | |
parent | bdd4b24c9e738c65ab8f6f9942358c59fe60edf1 (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-92fcb770aff434e994e7a39a61d8fac4a017dca0.tar.gz |
Merge branch 'refs/heads/master' into dom-architecture
Conflicts:
js/document/templates/montage-html/package.json
js/io/system/ninjalibrary.json
node_modules/descriptor.json
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/document/templates/montage-html/package.json')
-rwxr-xr-x | js/document/templates/montage-html/package.json | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/js/document/templates/montage-html/package.json b/js/document/templates/montage-html/package.json new file mode 100755 index 00000000..d1e839dc --- /dev/null +++ b/js/document/templates/montage-html/package.json | |||
@@ -0,0 +1,9 @@ | |||
1 | { | ||
2 | "directories": { | ||
3 | "lib": "" | ||
4 | }, | ||
5 | "mappings": { | ||
6 | "montage": "../../../../node_modules/montage/", | ||
7 | "montage-google": "../../../../node_modules/montage-google/" | ||
8 | } | ||
9 | } \ No newline at end of file | ||