aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/icon-list-basic/iconsList.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-08 16:43:43 -0700
committerArmen Kesablyan2012-05-08 16:43:43 -0700
commitdc075ffcc6dd03c090d90fad999eee9b924d56ee (patch)
tree867f8bdd588c8f9076979233ca46a688ff70523e /js/components/ui/icon-list-basic/iconsList.reel
parent5d7e470351fd150d5e70a97332fa2f2553797499 (diff)
parent4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff)
downloadninja-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/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>