diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/document | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/document')
| -rwxr-xr-x | js/document/templates/montage-html/package.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/document/templates/montage-html/package.json b/js/document/templates/montage-html/package.json index c8bc02fb..d1e839dc 100755 --- a/js/document/templates/montage-html/package.json +++ b/js/document/templates/montage-html/package.json | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | "lib": "" | 3 | "lib": "" |
| 4 | }, | 4 | }, |
| 5 | "mappings": { | 5 | "mappings": { |
| 6 | "montage": "../../../../node_modules/montage/" | 6 | "montage": "../../../../node_modules/montage/", |
| 7 | "montage-google": "../../../../node_modules/montage-google/" | ||
| 7 | } | 8 | } |
| 8 | } \ No newline at end of file | 9 | } \ No newline at end of file |