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/document-entry.reel/document-entry.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/document-entry.reel/document-entry.html')
| -rwxr-xr-x[-rw-r--r--] | js/components/layout/document-entry.reel/document-entry.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html index ba17449a..1cf01737 100644..100755 --- a/js/components/layout/document-entry.reel/document-entry.html +++ b/js/components/layout/document-entry.reel/document-entry.html | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | <body> | 26 | <body> |
| 27 | <li id="documentEntry" class="documentEntry"> | 27 | <li id="documentEntry" class="documentEntry"> |
| 28 | <div id="isActive"></div> | 28 | <div id="isActive"></div> |
| 29 | <div id="dirtyFlag"></div> | ||
| 30 | <span id="name"></span> | 29 | <span id="name"></span> |
| 31 | <img src="js/components/layout/document-entry.reel/close_button.gif"> | 30 | <img src="js/components/layout/document-entry.reel/close_button.gif"> |
| 32 | </li> | 31 | </li> |