aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/line-properties.reel
diff options
context:
space:
mode:
authorJon Reid2012-06-15 10:10:41 -0700
committerJon Reid2012-06-15 10:10:41 -0700
commit526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch)
tree65939e59615aaa10a7db77211e71616ad531bd0e /js/components/tools-properties/line-properties.reel
parentb5b760ee82e5cc4da176914983a6002cbf86c11a (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/components/tools-properties/line-properties.reel')
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/js/components/tools-properties/line-properties.reel/line-properties.js b/js/components/tools-properties/line-properties.reel/line-properties.js
index ce8c0494..8c845432 100755
--- a/js/components/tools-properties/line-properties.reel/line-properties.js
+++ b/js/components/tools-properties/line-properties.reel/line-properties.js
@@ -9,7 +9,10 @@ var Montage = require("montage/core/core").Montage,
9 9
10exports.LineProperties = Montage.create(ToolProperties, { 10exports.LineProperties = Montage.create(ToolProperties, {
11 11
12 base: { value: null }, 12 base: {
13 value: null,
14 serializable: true
15 },
13 16
14 _subPrepare: { 17 _subPrepare: {
15 value: function() { 18 value: function() {