aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/styles-controller.js
diff options
context:
space:
mode:
authorhwc4872012-02-03 09:33:35 -0800
committerhwc4872012-02-03 09:33:35 -0800
commit7dd20aec0a91731c2acaa0abfa66b754b6c82fe6 (patch)
tree278b656279d028d4d20ac5345837f1eb87ba4192 /js/controllers/styles-controller.js
parente02deaf0d1b1f7dbcf022442cb730490ac8cee8b (diff)
parentc630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
downloadninja-7dd20aec0a91731c2acaa0abfa66b754b6c82fe6.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into working
Diffstat (limited to 'js/controllers/styles-controller.js')
-rw-r--r--js/controllers/styles-controller.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index d462bc98..afd298c9 100644
--- 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
7var Montage = require("montage/core/core").Montage, 7var 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