diff options
| author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
| commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
| tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/panels/css-panel/style-sheet.reel/style-sheet.html | |
| parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
| parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
| download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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"} |