diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /js/components/layout/bread-crumb.reel/bread-crumb.html | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/components/layout/bread-crumb.reel/bread-crumb.html')
| -rwxr-xr-x[-rw-r--r--] | 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 100644..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 | ||