aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/icon-list-basic/iconsList.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/ui/icon-list-basic/iconsList.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/ui/icon-list-basic/iconsList.reel')
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
index 35260527..05d3ea7d 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
@@ -55,9 +55,9 @@
55 </script> 55 </script>
56</head> 56</head>
57<body> 57<body>
58<div id="list" class="list"> 58<div data-montage-id="list" class="list">
59 <div id="iconsView"> 59 <div data-montage-id="iconsView">
60 <div id="icon"></div> 60 <div data-montage-id="icon"></div>
61 </div> 61 </div>
62</div> 62</div>
63</body> 63</body>