diff options
| author | Nivesh Rajbhandari | 2012-05-10 15:48:51 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-05-10 15:48:51 -0700 |
| commit | 0467a1cf331c067b21bf5d6acfe47ec9edc2e41c (patch) | |
| tree | ae6122570b41879b5fa434c970592fe1deb23a2e /js/document/templates | |
| parent | 78b3363a1ef802e95a158b5a3584305f84def09c (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-0467a1cf331c067b21bf5d6acfe47ec9edc2e41c.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Conflicts:
js/io/system/ninjalibrary.json
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/document/templates')
| -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 |