OSDN Git Service
Tim Gerundt [Sat, 2 Oct 2010 14:31:53 +0000 (14:31 +0000)]
PATCH: [
3079966 ] Installer: Don't install quick launch icon for Windows 7
Tim Gerundt [Sat, 2 Oct 2010 11:05:38 +0000 (11:05 +0000)]
Installer: Remove Uninstall shortcut from start menu folder (#
3076909)
Tim Gerundt [Thu, 30 Sep 2010 05:48:40 +0000 (05:48 +0000)]
PATCH: [
3078012 ] Drop text encoding note from manual
Jochen Tucht [Sun, 26 Sep 2010 08:00:44 +0000 (08:00 +0000)]
PATCH: [
3026022 ] Turn STL exceptions into MFC exceptions
Tim Gerundt [Sat, 25 Sep 2010 11:33:20 +0000 (11:33 +0000)]
Docs: Update InnoSetup and WIX readme files
Kimmo Varis [Wed, 22 Sep 2010 16:22:45 +0000 (16:22 +0000)]
Update version number in trunk to 2.15.1.
Kimmo Varis [Mon, 20 Sep 2010 20:00:37 +0000 (20:00 +0000)]
Add Python script to check VS project files.
This initial version checks that all files listed in VS project file
exist also in disk.
Tim Gerundt [Mon, 20 Sep 2010 09:16:45 +0000 (09:16 +0000)]
Link to VC2008 runtimes installer in InnoSetup readme
Tim Gerundt [Sat, 18 Sep 2010 15:20:16 +0000 (15:20 +0000)]
Drop ANSI files from readme-InnoSetup.html
Kimmo Varis [Wed, 15 Sep 2010 17:39:36 +0000 (17:39 +0000)]
WinMerge 2.13.14 experimental release (r7263)
Kimmo Varis [Wed, 15 Sep 2010 17:19:39 +0000 (17:19 +0000)]
PATCH: #
3066314 ShellExtension language ID fix
Fixes bug #
3066213
Submitted by Matthias Mayer
Kimmo Varis [Tue, 14 Sep 2010 17:02:29 +0000 (17:02 +0000)]
WinMerge 2.13.14 experimental release (r7261)
Kimmo Varis [Tue, 14 Sep 2010 16:46:27 +0000 (16:46 +0000)]
Update ShellExtension RC files from PO files.
Kimmo Varis [Mon, 13 Sep 2010 19:14:34 +0000 (19:14 +0000)]
Updating changelog for:
- release compiler and runtimes version (now VS2008)
- dropping of ANSI binaries
- dropping support for W95, W98, WME and NT4
Kimmo Varis [Mon, 13 Sep 2010 18:41:22 +0000 (18:41 +0000)]
Docs: Updates for dropping ANSI targets and using VS2008.
Kimmo Varis [Mon, 13 Sep 2010 18:27:49 +0000 (18:27 +0000)]
Buildscript: Don't build ANSI targets as we are not distributing them anymore.
Kimmo Varis [Mon, 13 Sep 2010 18:11:18 +0000 (18:11 +0000)]
Buildscript: Update project/solution files before building.
Kimmo Varis [Mon, 13 Sep 2010 17:35:27 +0000 (17:35 +0000)]
Fix typo causing a build failure for ANSI targets.
Kimmo Varis [Mon, 13 Sep 2010 15:40:14 +0000 (15:40 +0000)]
PATCH: #
3010934 custom code as String or integer
Fixes bug item #
2813825
Patch submitted by Matthias Mayer
Kimmo Varis [Mon, 13 Sep 2010 15:08:06 +0000 (15:08 +0000)]
PATCH: #
3065267 Memeoryleak in Diffutils
Fixes memory leak added in patch #
3046938
Submitted by Matthias mayer
Kimmo Varis [Mon, 13 Sep 2010 15:00:27 +0000 (15:00 +0000)]
PATCH: #
3056974 FileFilterMgr accepts long filepath
Fixes bug #
3050199
Submitted by Matthias Mayer
Updates after review.
Tim Gerundt [Mon, 13 Sep 2010 08:36:25 +0000 (08:36 +0000)]
Fix SLOVENIAN SUBLANG ShellExtension
Tim Gerundt [Mon, 13 Sep 2010 08:14:24 +0000 (08:14 +0000)]
PATCH: [
3017674 ] New Serbian Language - Add Serbian readme to installer
Kimmo Varis [Sun, 12 Sep 2010 10:24:09 +0000 (10:24 +0000)]
PATCH: #
3056974 FileFilterMgr accepts long filepath
Fixes bug #
3050199
Submitted by Matthias Mayer
Takashi Sawanaka [Sat, 11 Sep 2010 13:03:38 +0000 (13:03 +0000)]
BUG: [
3056008] About Winmerge & Microsoft Security Advisory (
2269637)
Tim Gerundt [Thu, 9 Sep 2010 09:01:48 +0000 (09:01 +0000)]
Fix post build events in MergeLangX64.vcproj
Tim Gerundt [Thu, 9 Sep 2010 06:23:50 +0000 (06:23 +0000)]
PATCH: [
3061941 ] Drop X64 * configs from x64 project
Tim Gerundt [Wed, 8 Sep 2010 10:11:43 +0000 (10:11 +0000)]
Drop Ansi config from x64 project - Drop <FileConfiguration> too
Tim Gerundt [Wed, 8 Sep 2010 08:53:37 +0000 (08:53 +0000)]
Disable precompiled header for DiffItemList.cpp in "UnicodeRelease|x64" and "UnicodeDebug|x64" config from MergeX64.vcproj
Kimmo Varis [Tue, 7 Sep 2010 15:05:53 +0000 (15:05 +0000)]
Update WinMerge version to 2.13.14.
Kimmo Varis [Tue, 7 Sep 2010 15:02:00 +0000 (15:02 +0000)]
Installer: Install VS2008 runtimes merge modules.
Tim Gerundt [Sun, 5 Sep 2010 09:21:22 +0000 (09:21 +0000)]
Drop Ansi config from x64 project
Tim Gerundt [Fri, 3 Sep 2010 19:39:48 +0000 (19:39 +0000)]
BUG: [
3022292 ] Location pane focus enabled "Save"
Tim Gerundt [Fri, 3 Sep 2010 19:07:04 +0000 (19:07 +0000)]
BUG: [
3033325 ] copy and advance: toolbar icons not automatically enabled
Tim Gerundt [Fri, 3 Sep 2010 15:21:15 +0000 (15:21 +0000)]
BUG: [
3033324 ] Chinese (trad.): "Alt + <key>" has extra space
Tim Gerundt [Wed, 1 Sep 2010 05:42:35 +0000 (05:42 +0000)]
PATCH: #
3025078 Installer: Drop Windows 9x/ME/NT4 support from InnoSetup
Kimmo Varis [Tue, 31 Aug 2010 18:03:24 +0000 (18:03 +0000)]
PATCH: #
3046938 Improvement in Folder comparison
Submitted by Saitaman
Kimmo Varis [Wed, 11 Aug 2010 15:46:04 +0000 (15:46 +0000)]
PATCH: #
3042393 Recognize .ascx files as ASP files
Kimmo Varis [Thu, 5 Aug 2010 19:50:57 +0000 (19:50 +0000)]
PATCH: #
3034083 Improvement in filter comments
Submitted by saitaman@sourceforge
Kimmo Varis [Thu, 5 Aug 2010 16:59:05 +0000 (16:59 +0000)]
PATCH: #
2929005 Quickcompare and EOL
New fix for the bug - earlier fix caused an endless loop.
Submitted by Matthias Mayer.
Tim Gerundt [Sat, 17 Jul 2010 15:17:13 +0000 (15:17 +0000)]
PATCH: [
3025202 ] French translation
Kimmo Varis [Tue, 13 Jul 2010 11:54:21 +0000 (11:54 +0000)]
BUG: #
3027893 Relase fails with VS2008 since rev.7215
Fixed based on Matthias's patch #
3028416.
Takashi Sawanaka [Thu, 8 Jul 2010 14:48:44 +0000 (14:48 +0000)]
BUG: [
2794137 ] WinMerge.INI importing has problem...
Takashi Sawanaka [Thu, 8 Jul 2010 14:44:15 +0000 (14:44 +0000)]
BUG: [
3025855 ] Untranslated strings in folder compare window
Jochen Tucht [Sun, 4 Jul 2010 18:55:49 +0000 (18:55 +0000)]
PATCH: [
3017741 ] Fix readonly logic for ClearCase integration
Jochen Tucht [Sun, 4 Jul 2010 18:46:04 +0000 (18:46 +0000)]
Make DIFFRANGE::op and respective function parameters type-safe
Jochen Tucht [Sun, 4 Jul 2010 11:02:24 +0000 (11:02 +0000)]
Fix a signed vs. unsigned warning
Kimmo Varis [Sun, 4 Jul 2010 09:57:53 +0000 (09:57 +0000)]
PATCH: #
3022014 Stingdiffs more detail on char level
Submitted by Matthias Mayer.
Jochen Tucht [Sat, 3 Jul 2010 13:02:59 +0000 (13:02 +0000)]
Remove unwanted copy-paste leftovers
Kimmo Varis [Thu, 1 Jul 2010 15:40:16 +0000 (15:40 +0000)]
Fixing 64-bit build warnings.
Kimmo Varis [Thu, 1 Jul 2010 14:54:51 +0000 (14:54 +0000)]
Fixing 64-bit build warnings.
Kimmo Varis [Thu, 1 Jul 2010 13:30:43 +0000 (13:30 +0000)]
Fixing 64-bit compile warnings.
Kimmo Varis [Thu, 1 Jul 2010 12:49:38 +0000 (12:49 +0000)]
Fix 64-bit build warnings in BCMenu.
Kimmo Varis [Thu, 1 Jul 2010 10:59:36 +0000 (10:59 +0000)]
Fix some 64-bit build warnings.
Kimmo Varis [Thu, 1 Jul 2010 09:25:10 +0000 (09:25 +0000)]
Win64: Put temp build files to BuildTmp folder as 32-bit builds do.
Kimmo Varis [Thu, 1 Jul 2010 08:36:46 +0000 (08:36 +0000)]
Update SCEW to 1.1.2
Jochen Tucht [Wed, 30 Jun 2010 05:34:17 +0000 (05:34 +0000)]
PATCH: [
3012200 ] Defer unicode conversion to diffutils
Kimmo Varis [Tue, 29 Jun 2010 21:11:39 +0000 (21:11 +0000)]
Update to PCRE 8.10.
Tim Gerundt [Tue, 29 Jun 2010 16:44:20 +0000 (16:44 +0000)]
Fix post build event for "X64 Debug" and "X64 Release" in pcreX64.vcproj
Tim Gerundt [Mon, 28 Jun 2010 14:30:33 +0000 (14:30 +0000)]
Fix post build event for "X64 Debug" and "X64 Release" in expatX64.vcproj
Tim Gerundt [Mon, 28 Jun 2010 10:58:17 +0000 (10:58 +0000)]
Fix translation paths in MergeLangX64.vcproj
Kimmo Varis [Sat, 19 Jun 2010 13:51:51 +0000 (13:51 +0000)]
Fix InnoSetup installer file by adding missing semicolon.
Kimmo Varis [Sat, 19 Jun 2010 13:02:44 +0000 (13:02 +0000)]
WinMerge experimental release 2.13.13. (SVN r7205)
Kimmo Varis [Sat, 19 Jun 2010 13:00:23 +0000 (13:00 +0000)]
Fix typo in release script.
Kimmo Varis [Sat, 19 Jun 2010 12:52:04 +0000 (12:52 +0000)]
Bump WinMerge version to 2.13.13 and Shellextension version to 1.16.3.
Kimmo Varis [Sat, 19 Jun 2010 12:46:49 +0000 (12:46 +0000)]
Translations: Update WinMerge POT and PO files.
Kimmo Varis [Sat, 19 Jun 2010 12:41:51 +0000 (12:41 +0000)]
Changelog: add recent bug fixes and improvements.
Kimmo Varis [Sat, 19 Jun 2010 12:23:00 +0000 (12:23 +0000)]
Restore changelog line that got removed when backing out patch.
Jan Hryz [Sat, 19 Jun 2010 07:40:16 +0000 (07:40 +0000)]
Update of translation
Tim Gerundt [Thu, 17 Jun 2010 20:16:49 +0000 (20:16 +0000)]
PATCH: [
3017674 ] New Serbian Language - Add ShellExtension changes
Tim Gerundt [Thu, 17 Jun 2010 19:37:02 +0000 (19:37 +0000)]
PATCH: [
3017674 ] New Serbian Language
Tim Gerundt [Thu, 17 Jun 2010 16:40:17 +0000 (16:40 +0000)]
PATCH: [
3014912 ] Installer: Set default language with MSI setup
Jochen Tucht [Thu, 17 Jun 2010 05:47:45 +0000 (05:47 +0000)]
PATCH: [
3016907 ] Fix Bug #
2968177 Ignoring comments wrongly recognizes // ...
Jochen Tucht [Mon, 14 Jun 2010 21:27:35 +0000 (21:27 +0000)]
Fix regression from MFC to STL string conversion committed as of revision 6865.
Jochen Tucht [Sun, 13 Jun 2010 20:02:50 +0000 (20:02 +0000)]
Add Merge7z914 to Merge7zInstaller
Jochen Tucht [Sun, 13 Jun 2010 20:01:22 +0000 (20:01 +0000)]
Add Merge7z914.vcxproj
Jochen Tucht [Sun, 13 Jun 2010 15:22:21 +0000 (15:22 +0000)]
fix a warning
Jochen Tucht [Sun, 13 Jun 2010 15:18:34 +0000 (15:18 +0000)]
Fix last commit breaking compilation due to "struct stat" vs. "struct _stat".
Jochen Tucht [Sun, 13 Jun 2010 14:58:54 +0000 (14:58 +0000)]
BUG: [
2982964 ] Wrong time stamp even in latest revision (NOT old bug)
Jochen Tucht [Sun, 13 Jun 2010 12:18:30 +0000 (12:18 +0000)]
CSortHeaderCtrl: Replace GetDllVersion() by SendMessage(CCM_GETVERSION), which works for comctl32.dll 5.80 and better.
As this removes the last reference to GetDllVersion(), we are now ready to drop dllver.cpp/.h.
Jochen Tucht [Sun, 13 Jun 2010 12:10:45 +0000 (12:10 +0000)]
Remove unnecessary #include "dllver.h"
Jochen Tucht [Sun, 13 Jun 2010 10:20:59 +0000 (10:20 +0000)]
PATCH: [
3015416 ] LineFiltersDlg: Employ listview in-place editing capability
Jochen Tucht [Sun, 13 Jun 2010 10:13:37 +0000 (10:13 +0000)]
PATCH: [
3015396 ] Remove obsolete dll version checks
Jochen Tucht [Sun, 13 Jun 2010 09:02:45 +0000 (09:02 +0000)]
CMergeDiffDetailView: Fix an inconsistency in m_lineBegin vs. m_lineEnd vs. m_diffLength, which was occurring after rescan.
Kimmo Varis [Sun, 13 Jun 2010 08:25:01 +0000 (08:25 +0000)]
Update 2.12.4 release notes to trunk.
Kimmo Varis [Sat, 12 Jun 2010 13:00:33 +0000 (13:00 +0000)]
Buildscript: Use Python's optparse module to parse command line.
Kimmo Varis [Sat, 12 Jun 2010 12:55:52 +0000 (12:55 +0000)]
BUG: #
2995925 No refreshing after merging difference
Revert revisions 7086 and 7089 to fix the regression.
Kimmo Varis [Sat, 12 Jun 2010 09:58:16 +0000 (09:58 +0000)]
Fix the changelog item - use the patch ID when it exists.
Kimmo Varis [Sat, 12 Jun 2010 09:56:48 +0000 (09:56 +0000)]
Changelog: Bugfix: Line filtering wasted huge amounts of memory
Jochen Tucht [Fri, 11 Jun 2010 19:59:11 +0000 (19:59 +0000)]
PATCH: [
3014162 ] Fix LineFilters wasting enormous amounts of memory
Jochen Tucht [Wed, 9 Jun 2010 06:22:56 +0000 (06:22 +0000)]
HexMergeView: Differences could fail to show up in left pane unless some action was taken that would cause a repaint (seen on Vista with OPT_SCROLL_TO_FIRST off).
Jochen Tucht [Sun, 6 Jun 2010 13:41:33 +0000 (13:41 +0000)]
Fix an apparent bug in to_utf8_advance()
Jochen Tucht [Wed, 2 Jun 2010 14:51:43 +0000 (14:51 +0000)]
VC2010 does not accept a dot to serve as a class resolution operator
Tim Gerundt [Wed, 2 Jun 2010 06:24:43 +0000 (06:24 +0000)]
Fix some batch files paths in Merge.vcproj
Tim Gerundt [Wed, 2 Jun 2010 06:19:33 +0000 (06:19 +0000)]
Fix CreateMasterPotFile calls in MergeLangX64.vcproj
Jochen Tucht [Wed, 19 May 2010 12:57:18 +0000 (12:57 +0000)]
Restart discussion about binary file detection (TODO #
1946860)
Jochen Tucht [Wed, 19 May 2010 12:25:14 +0000 (12:25 +0000)]
Fix possible access beyond end of memory mapped file
Jochen Tucht [Sun, 16 May 2010 15:19:15 +0000 (15:19 +0000)]
string_replace(): Fix infinite loop if (replace) contains an occurrence of (find) at a position greater than the length of (find).
Jochen Tucht [Sun, 16 May 2010 14:44:19 +0000 (14:44 +0000)]
• Read 7-Zip version from 7z.dll (which has long ago replaced the various format and codec DLLs)
• Change recommended version of 7-Zip to 4.65
Jochen Tucht [Sun, 16 May 2010 13:45:23 +0000 (13:45 +0000)]
VC2010 does not accept a dot to serve as a class resolution operator