diff options
| author | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
| commit | 7959d2ecc6e8b1799307de1ceab1112b8ab58e8d (patch) | |
| tree | ce4e32578e1af4d49b8375933a6b7edd0a095b0f /node_modules/montage/core/shim.js | |
| parent | 83ac41dd75ec551cdb03252e0bf3081182517d05 (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-7959d2ecc6e8b1799307de1ceab1112b8ab58e8d.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to 'node_modules/montage/core/shim.js')
| -rwxr-xr-x | node_modules/montage/core/shim.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/node_modules/montage/core/shim.js b/node_modules/montage/core/shim.js index 18aa0233..e6c1a097 100755 --- a/node_modules/montage/core/shim.js +++ b/node_modules/montage/core/shim.js | |||
| @@ -7,8 +7,6 @@ | |||
| 7 | @module montage/core/shim | 7 | @module montage/core/shim |
| 8 | @requires montage/core/shim/string | 8 | @requires montage/core/shim/string |
| 9 | @requires montage/core/shim/array | 9 | @requires montage/core/shim/array |
| 10 | @requires montage/core/shim/timers | ||
| 11 | */ | 10 | */ |
| 12 | require("./shim/string"); | 11 | require("./shim/string"); |
| 13 | require("./shim/array"); | 12 | require("./shim/array"); |
| 14 | require("./shim/timers"); \ No newline at end of file | ||