aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/documents-tab.reel
diff options
context:
space:
mode:
authorhwc4872012-05-11 13:52:55 -0700
committerhwc4872012-05-11 13:52:55 -0700
commit137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
treee9fa109fc65218f45e386df48b713ff5858f3d62 /js/components/layout/documents-tab.reel
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/components/layout/documents-tab.reel')
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html
index 1516a8ce..4aed23d9 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.html
@@ -69,9 +69,9 @@
69 </head> 69 </head>
70 70
71 <body> 71 <body>
72 <div id="openDocumentsTabComponent" class="documentsTab"> 72 <div data-montage-id="openDocumentsTabComponent" class="documentsTab">
73 <ul id="openDocuments" class="openDocuments"> 73 <ul data-montage-id="openDocuments" class="openDocuments">
74 <li id="document"></li> 74 <li data-montage-id="document"></li>
75 </ul> 75 </ul>
76 </div> 76 </div>
77 </body> 77 </body>