aboutsummaryrefslogtreecommitdiff
path: root/js/panels/CSSPanel/ComputedStyleSubPanel.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-02 18:04:37 -0800
committerJose Antonio Marquez2012-02-02 18:04:37 -0800
commit7959d2ecc6e8b1799307de1ceab1112b8ab58e8d (patch)
treece4e32578e1af4d49b8375933a6b7edd0a095b0f /js/panels/CSSPanel/ComputedStyleSubPanel.reel
parent83ac41dd75ec551cdb03252e0bf3081182517d05 (diff)
parentc630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
downloadninja-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 'js/panels/CSSPanel/ComputedStyleSubPanel.reel')
-rw-r--r--js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js
index 0e1cf206..bb6f9de6 100644
--- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js
+++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js
@@ -6,7 +6,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
6 6
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 nj = require("js/lib/NJUtils.js").NJUtils; 9 nj = require("js/lib/NJUtils").NJUtils;
10 10
11 11
12exports.ComputedStyleSubPanel = Montage.create(Component, { 12exports.ComputedStyleSubPanel = Montage.create(Component, {