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/css-panel/style-sheet.reel/style-sheet.html | |
| 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/css-panel/style-sheet.reel/style-sheet.html')
| -rw-r--r-- | js/panels/css-panel/style-sheet.reel/style-sheet.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.html b/js/panels/css-panel/style-sheet.reel/style-sheet.html index 7e27dd93..d08453fa 100644 --- a/js/panels/css-panel/style-sheet.reel/style-sheet.html +++ b/js/panels/css-panel/style-sheet.reel/style-sheet.html | |||
| @@ -27,7 +27,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 27 | "properties": { | 27 | "properties": { |
| 28 | "element": {"#": "sheet-name"}, | 28 | "element": {"#": "sheet-name"}, |
| 29 | "identifier": "nameText", | 29 | "identifier": "nameText", |
| 30 | "defaultText": "Style sheet" | 30 | "defaultValue": "Style sheet" |
| 31 | }, | 31 | }, |
| 32 | "bindings": { | 32 | "bindings": { |
| 33 | "value": {"<-": "@owner.name"} | 33 | "value": {"<-": "@owner.name"} |