diff options
| author | Nivesh Rajbhandari | 2012-04-16 16:06:24 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-04-16 16:06:24 -0700 |
| commit | c253192a08b499ea7be46fa5438d273e51f7ec5a (patch) | |
| tree | 18a1f0e3679c0eb993a9dedb537035d3861f49ac /js/components/tools-properties/text-properties.reel/text-properties.html | |
| parent | e19376c54eedd1f1c457ba405b2f110be376a559 (diff) | |
| parent | 4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff) | |
| download | ninja-c253192a08b499ea7be46fa5438d273e51f7ec5a.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
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"} |