aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-10 15:48:51 -0700
committerNivesh Rajbhandari2012-05-10 15:48:51 -0700
commit0467a1cf331c067b21bf5d6acfe47ec9edc2e41c (patch)
treeae6122570b41879b5fa434c970592fe1deb23a2e /js/document
parent78b3363a1ef802e95a158b5a3584305f84def09c (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-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')
-rwxr-xr-xjs/document/templates/montage-html/package.json3
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