Skip to content

Commit cd155bd

Browse files
committed
Update Changelog & Release Notes
1 parent 3ea2c72 commit cd155bd

File tree

2 files changed

+22
-8
lines changed

2 files changed

+22
-8
lines changed

Docs/Users/CHANGES

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
0.2011.210.466
2+
Changes since preceding release (not necessarily complete):
3+
� Support Excel .xlsx files through ReoGrid
4+
� Merge pull request #3 from Jonimoose/eastl_vs_std_fixes
5+
� CMergeEditView::ShowDiff(): Exclude top margin area from scrolling
6+
� Adopt DPI aware toolbar from winmerge-v2
7+
� Tweak Diffutils 3.6 ignore blank lines option for CRLF line endings
8+
19
0.2011.210.381
210
Changes since preceding release (not necessarily complete):
311
� Integrate SQLite Compare into WinMerge GUI

Docs/Users/ReleaseNotes.html

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</script>
4141
</head>
4242
<body>
43-
<h2>WinMerge 0.2011.210.381 Release Notes</h2>
43+
<h2>WinMerge 0.2011.210.466 Release Notes</h2>
4444
This is an experimental release of WinMerge 2011.<br>
4545
It includes the following enhancements as compared to the previous stable release:
4646
<ul class='features'>
@@ -49,6 +49,11 @@ <h2>WinMerge 0.2011.210.381 Release Notes</h2>
4949
<li><p>SQLite 3 database files are presented in a <a target='_blank' href='https://github.com/datadiode/SQLiteCompare'>modified version</a> of <a target='_blank' href='https://www.codeproject.com/Articles/220018/SQLite-Compare-Utility'>SQLite Compare</a>
5050
which allows its embedding into the WinMerge GUI.
5151
<br>This modified version also fixes quite a number of bugs found in the original product, and continues to work independently from WinMerge.
52+
<li><p>Limited support for Excel .xlsx files is offered through <a target='_blank' href='https://github.com/datadiode/ReoGrid'>ReoGrid</a>.
53+
<br>The ReoGrid Compare application implemented by that fork is specifically tailored to run inside the WinMerge GUI, but can also be used as a standalone application.
54+
<p><u>An urgent warning on this one:</u>
55+
<br>While ReoGrid supports a remarkable subset of Excel's features, a round trip through ReoGrid isn't lossless.
56+
<br>Therefore, take extra care when saving .xlsx files back after editing, and double-check whether the round-trip loss is tolerable for you.
5257
<li><p>As an alternative to GNU diff, you can choose among algorithms provided by LibXDiff.
5358
<br>In particular, you may find LibXDiff's <i>indent heuristics</i> option useful.
5459
<br>This feature was adopted from WinMerge 2.16.
@@ -64,14 +69,15 @@ <h2>WinMerge 0.2011.210.381 Release Notes</h2>
6469
<br>Note that WinMerge 2.16's <i>Table Compare</i> feature is superior in that it allows you to adjust cell widths, and can wrap texts inside cells accordingly.
6570
<br>I found this feature to be quite a nightmare to implement in a way that does not mess up editing, so resorted to a simplified, tab-stop like approach.
6671
</ul>
67-
<h5>Source code links for GPL-licensed binaries included in this release:</h5>
72+
<h5>Source code links for GPL-licensed/infected binaries included in this release:</h5>
6873
<ul>
69-
<li><a target='_blank' href='https://github.com/datadiode/winmerge2011/releases/tag/0.2011.210.381'>Source code of WinMerge 2011</a>
70-
<li><a target='_blank' href='https://github.com/datadiode/frhed/releases/tag/0.10907.2020'>Source code of Frhed</a>
71-
<li><a target='_blank' href='https://github.com/WinMerge/winimerge/releases/tag/1.0.20.0'>Source code of WinIMerge</a>
72-
<li><a target='_blank' href='https://github.com/datadiode/SQLiteCompare/releases/tag/v3.0.32'>Source code of SQLite Compare</a>
73-
<li><a target='_blank' href='https://github.com/schdub/protodec/releases/tag/v0.6.3-win'>Source code of protodec</a>
74+
<li><a target='_blank' href='https://github.com/datadiode/winmerge2011/releases/tag/0.2011.210.466'>WinMerge 2011</a>
75+
<li><a target='_blank' href='https://github.com/datadiode/frhed/releases/tag/0.10907.2020'>Frhed</a>
76+
<li><a target='_blank' href='https://github.com/WinMerge/winimerge/releases/tag/1.0.20.0'>WinIMerge</a>
77+
<li><a target='_blank' href='https://github.com/datadiode/SQLiteCompare/releases/tag/3.1.0.0-datadiode-006'>SQLite Compare</a>
78+
<li><a target='_blank' href='https://github.com/datadiode/ReoGrid/releases/tag/2.3.0.0-datadiode-094'>ReoGrid</a>
79+
<li><a target='_blank' href='https://github.com/schdub/protodec/releases/tag/v0.6.3-win'>protodec</a>
7480
</ul>
75-
<i>Jochen Neubeck, September 2020</i>
81+
<i>Jochen Neubeck, November 2020</i>
7682
<xml src='WinMerge.chm' onreadystatechange='OnReadyStateChangeExternalDoc()'></xml>
7783
</body>

0 commit comments

Comments
 (0)