diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/components-panel.reel/components-panel.html | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/panels/components-panel.reel/components-panel.html')
| -rwxr-xr-x | js/panels/components-panel.reel/components-panel.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/components-panel.reel/components-panel.html b/js/panels/components-panel.reel/components-panel.html index c78988e0..1a257957 100755 --- a/js/panels/components-panel.reel/components-panel.html +++ b/js/panels/components-panel.reel/components-panel.html | |||
| @@ -53,8 +53,8 @@ | |||
| 53 | </head> | 53 | </head> |
| 54 | <body> | 54 | <body> |
| 55 | 55 | ||
| 56 | <div id="components_panel" class="components_panel"> | 56 | <div data-montage-id="components_panel" class="components_panel"> |
| 57 | <div id="componentsContainer"></div> | 57 | <div data-montage-id="componentsContainer"></div> |
| 58 | </div> | 58 | </div> |
| 59 | 59 | ||
| 60 | </body> | 60 | </body> |