diff options
| author | Eric Guzman | 2012-04-02 15:36:08 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-02 15:36:08 -0700 |
| commit | 0241bf331b7e06e206a54be441edf2f4c7261f63 (patch) | |
| tree | b7e2f9cad73eed4fc616cf1841cd0be02bd955d4 /js/components/tools-properties/text-properties.reel/text-properties.html | |
| parent | dde5b5054f93db493e5d4d502e677f5781334b08 (diff) | |
| parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
| download | ninja-0241bf331b7e06e206a54be441edf2f4c7261f63.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.html')
| -rwxr-xr-x | js/components/tools-properties/text-properties.reel/text-properties.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html index 13a88ba7..2d50a79e 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html | |||
| @@ -69,7 +69,7 @@ | |||
| 69 | 69 | ||
| 70 | }, | 70 | }, |
| 71 | "fontSettings": { | 71 | "fontSettings": { |
| 72 | "module": "js/components/button.reel", | 72 | "module": "montage/ui/button.reel", |
| 73 | "name": "Button", | 73 | "name": "Button", |
| 74 | "properties": { | 74 | "properties": { |
| 75 | "element": {"#": "fontSettings"} | 75 | "element": {"#": "fontSettings"} |