Update release notes and changelog for 2.15.5

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index 8ae5fed..558971e 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -6,12 +6,13 @@ http://winmerge.org/tracker/[tracker-id]
 
 WinMerge 2.15.5
   General:
-  - Add support for very long path and file names (GitHub #87,95)
+  - Add support for very long path and file names (GitHub #87,95,99)
   - Enable Ctrl+C shortcut key on the file path bar
   - Remove support for old version control system (GitHub #96)
   - Improve Options > Color > Differences dialog layout (GitHub #89)
   - Improve information and formatting in Help > Configuration reporting (GitHub #92)
   - Improve visual layout of Open dialog (GitHub #97)
+  - Add icon for "New (3 panes)" menu item (GitHub #97)
   File compare:
   - Add Window/Split menu item
   - Improve handling of last lines in files (GitHub #89,90,93)
@@ -25,6 +26,7 @@ WinMerge 2.15.5
   - Update Italian translation (GitHub #86)
   - Update Japanese translation (Bitbucket #3)
   - Update Dutch translation
+  - Update German translation
   - Bugfix Spanish translation error (Bitbucket Issue #108)
   Internals:
   - Various diffengine and compilation/build fixes

diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html
index f067ae0..c7343c7 100644 (file)
--- a/Docs/Users/ReleaseNotes.html
+++ b/Docs/Users/ReleaseNotes.html
@@ -72,12 +72,13 @@ Please submit bug reports to our <a href="http://bitbucket.org/winmerge/winmerge
 
 <h4>General</h4>
 <ul>
-  <li>Add support for very long path and file names (GitHub #87,95)</li>
+  <li>Add support for very long path and file names (GitHub #87,95,99)</li>
   <li>Enable Ctrl+C shortcut key on the file path bar</li>
   <li>Remove support for old version control system (GitHub #96)</li>
   <li>Improve Options &gt; Color &gt; Differences dialog layout (GitHub #89)</li>
   <li>Improve information and formatting in Help &gt; Configuration reporting (GitHub #92)</li>
   <li>Improve visual layout of Open dialog (GitHub #97)</li>
+  <li>Add icon for "New (3 panes)" menu item (GitHub #97)</li>
 </ul>
 
 <h4>File compare</h4>
@@ -464,10 +465,6 @@ WinMerge 2.15.2 is a beta release which mainly adds support for experimental 3-w
     in folder compare can get status changed to identical when opening them to file compare.</p>
   </li>
   <li>
-    <p><strong>VSS integration cannot add new files to VSS</strong></p>
-    <p>If you need to add a new file, you must add it via VSS client program.</p>
-  </li>
-  <li>
     <p><strong>Unset WinMerge integration from ClearCase</strong></p>
     <p>To remove WinMerge integration, you'll need to edit one file by hand:</p>
     <ol>