diff options
| author | Jon Reid | 2012-06-15 10:10:41 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
| commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
| tree | 65939e59615aaa10a7db77211e71616ad531bd0e /js/panels/properties.reel/section.reel/section.js | |
| parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
| parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
| download | ninja-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/panels/properties.reel/section.reel/section.js')
| -rwxr-xr-x | js/panels/properties.reel/section.reel/section.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/panels/properties.reel/section.reel/section.js b/js/panels/properties.reel/section.reel/section.js index b246c171..310bc48f 100755 --- a/js/panels/properties.reel/section.reel/section.js +++ b/js/panels/properties.reel/section.reel/section.js | |||
| @@ -11,6 +11,7 @@ exports.Section = Montage.create(Component, { | |||
| 11 | 11 | ||
| 12 | name: { | 12 | name: { |
| 13 | value: "Panel" | 13 | value: "Panel" |
| 14 | |||
| 14 | }, | 15 | }, |
| 15 | 16 | ||
| 16 | slot: { | 17 | slot: { |