diff options
| author | Ananya Sen | 2012-02-23 13:52:32 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-23 13:52:32 -0800 |
| commit | ec3d07c2fea4e79c68606234074f43d694982e5b (patch) | |
| tree | dc7c830c361d35c04a4d9b6d55c6c36d7a5d61cd /js/components/layout/bread-crumb.reel/bread-crumb.html | |
| parent | 7283884c39df537694b21419a3ea9e3ca7793b4b (diff) | |
| parent | 287a0bad5b774a380ec6c8b3ddf24dc03234e248 (diff) | |
| download | ninja-ec3d07c2fea4e79c68606234074f43d694982e5b.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/document/html-document.js
js/helper-classes/3D/snap-manager.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/layout/bread-crumb.reel/bread-crumb.html')
| -rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index 67328479..c1b9ed61 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
| @@ -62,7 +62,7 @@ | |||
| 62 | 62 | ||
| 63 | <div id="breadcrumb_trail" class="breadcrumbtrail"> | 63 | <div id="breadcrumb_trail" class="breadcrumbtrail"> |
| 64 | <div id="breadcrumb_container" class="bread_crumb"> | 64 | <div id="breadcrumb_container" class="bread_crumb"> |
| 65 | <div id="breadcrumb_button" class="toolbutton"></div> | 65 | <div id="breadcrumb_button"></div> |
| 66 | </div> | 66 | </div> |
| 67 | </div> | 67 | </div> |
| 68 | 68 | ||