aboutsummaryrefslogtreecommitdiff
path: root/js/panels/PanelContainer.reel/PanelContainer.html
diff options
context:
space:
mode:
authorhwc4872012-05-11 13:52:55 -0700
committerhwc4872012-05-11 13:52:55 -0700
commit137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
treee9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/PanelContainer.reel/PanelContainer.html
parentd21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
downloadninja-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/PanelContainer.reel/PanelContainer.html')
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html3
1 files changed, 1 insertions, 2 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
index e5cbbe32..ccefd3ae 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -67,7 +67,6 @@
67 "properties": { 67 "properties": {
68 "element": {"#": "panelContainer"}, 68 "element": {"#": "panelContainer"},
69 "panelData": {"@": "panelData" }, 69 "panelData": {"@": "panelData" },
70 "panelController" : {"@": "PanelController"},
71 "panel_0": {"@": "panel_0"}, 70 "panel_0": {"@": "panel_0"},
72 "panel_1": {"@": "panel_1"}, 71 "panel_1": {"@": "panel_1"},
73 "panel_2": {"@": "panel_2"}, 72 "panel_2": {"@": "panel_2"},
@@ -96,7 +95,7 @@
96 95
97 </head> 96 </head>
98<body> 97<body>
99 <section id="panelContainer"> 98 <section data-montage-id="panelContainer">
100 <article id="panels" class="panels"> 99 <article id="panels" class="panels">
101 <article data-montage-id="panel_0"></article> 100 <article data-montage-id="panel_0"></article>
102 <article data-montage-id="panel_1"></article> 101 <article data-montage-id="panel_1"></article>