diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/components/tools-properties/oval-properties.reel | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/oval-properties.reel')
-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 | ||