diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /js/components/tools-properties/oval-properties.reel/oval-properties.html | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/components/tools-properties/oval-properties.reel/oval-properties.html')
| -rwxr-xr-x | js/components/tools-properties/oval-properties.reel/oval-properties.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html index e460f7ea..c76e8c39 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.html +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html | |||
| @@ -35,9 +35,9 @@ | |||
| 35 | </head> | 35 | </head> |
| 36 | 36 | ||
| 37 | <body> | 37 | <body> |
| 38 | <div id="ovalProperties"> | 38 | <div data-montage-id="ovalProperties"> |
| 39 | <label class="label">Inner Radius:</label> | 39 | <label class="label">Inner Radius:</label> |
| 40 | <div id="innerRadiusControl" class="label"></div> | 40 | <div data-montage-id="innerRadiusControl" class="label"></div> |
| 41 | </div> | 41 | </div> |
| 42 | </body> | 42 | </body> |
| 43 | 43 | ||