diff options
| author | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
| commit | 04d89daed90c35a4393773ca2e2d0ac3a4c15cd4 (patch) | |
| tree | d0041abc7379ef38b20cce148e5dea6f531b8569 /js/controllers/styles-controller.js | |
| parent | 4d8306b638c53899403a4f0328c02bf1ab893e8f (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-04d89daed90c35a4393773ca2e2d0ac3a4c15cd4.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
.gitignore
js/ninja.reel/ninja.js
Diffstat (limited to 'js/controllers/styles-controller.js')
| -rwxr-xr-x | js/controllers/styles-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js index d462bc98..afd298c9 100755 --- a/js/controllers/styles-controller.js +++ b/js/controllers/styles-controller.js | |||
| @@ -7,7 +7,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 7 | var Montage = require("montage/core/core").Montage, | 7 | var Montage = require("montage/core/core").Montage, |
| 8 | Component = require("montage/ui/component").Component, | 8 | Component = require("montage/ui/component").Component, |
| 9 | cssShorthandMap = require("js/panels/CSSPanel/css-shorthand-map").CSS_SHORTHAND_MAP, | 9 | cssShorthandMap = require("js/panels/CSSPanel/css-shorthand-map").CSS_SHORTHAND_MAP, |
| 10 | nj = require("js/lib/NJUtils.js").NJUtils; | 10 | nj = require("js/lib/NJUtils").NJUtils; |
| 11 | 11 | ||
| 12 | /* | 12 | /* |
| 13 | 13 | ||