diff options
| author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
| commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
| tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /node_modules/montage/require/browser.js | |
| parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
| parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
| download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/require/browser.js')
| -rwxr-xr-x | node_modules/montage/require/browser.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/require/browser.js b/node_modules/montage/require/browser.js index f4a11d97..a6a8af5a 100755 --- a/node_modules/montage/require/browser.js +++ b/node_modules/montage/require/browser.js | |||
| @@ -82,7 +82,7 @@ if (global.navigator && global.navigator.userAgent.indexOf("Firefox") >= 0) { | |||
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | var __FILE__String = "__FILE__", | 84 | var __FILE__String = "__FILE__", |
| 85 | DoubleUnderscoreString = "__" | 85 | DoubleUnderscoreString = "__", |
| 86 | globalEvalConstantA = "(function ", | 86 | globalEvalConstantA = "(function ", |
| 87 | globalEvalConstantB = "(require, exports, module) {", | 87 | globalEvalConstantB = "(require, exports, module) {", |
| 88 | globalEvalConstantC = "//*/\n})\n//@ sourceURL="; | 88 | globalEvalConstantC = "//*/\n})\n//@ sourceURL="; |