OSDN Git Service

winmerge-jp/winmerge-jp.git
13 years agoPATCH: [ 3017674 ] New Serbian Language - Add Serbian readme to installer
Tim Gerundt [Mon, 13 Sep 2010 08:14:24 +0000 (08:14 +0000)]
PATCH: [ 3017674 ] New Serbian Language - Add Serbian readme to installer

13 years agoPATCH: #3056974 FileFilterMgr accepts long filepath
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

13 years agoBUG: [3056008] About Winmerge & Microsoft Security Advisory (2269637)
Takashi Sawanaka [Sat, 11 Sep 2010 13:03:38 +0000 (13:03 +0000)]
BUG: [3056008] About Winmerge & Microsoft Security Advisory (2269637)

13 years agoFix post build events in MergeLangX64.vcproj
Tim Gerundt [Thu, 9 Sep 2010 09:01:48 +0000 (09:01 +0000)]
Fix post build events in MergeLangX64.vcproj

13 years agoPATCH: [ 3061941 ] Drop X64 * configs from x64 project
Tim Gerundt [Thu, 9 Sep 2010 06:23:50 +0000 (06:23 +0000)]
PATCH: [ 3061941 ] Drop X64 * configs from x64 project

13 years agoDrop Ansi config from x64 project - Drop <FileConfiguration> too
Tim Gerundt [Wed, 8 Sep 2010 10:11:43 +0000 (10:11 +0000)]
Drop Ansi config from x64 project - Drop <FileConfiguration> too

13 years agoDisable precompiled header for DiffItemList.cpp in "UnicodeRelease|x64" and "UnicodeD...
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

13 years agoUpdate WinMerge version to 2.13.14.
Kimmo Varis [Tue, 7 Sep 2010 15:05:53 +0000 (15:05 +0000)]
Update WinMerge version to 2.13.14.

13 years agoInstaller: Install VS2008 runtimes merge modules.
Kimmo Varis [Tue, 7 Sep 2010 15:02:00 +0000 (15:02 +0000)]
Installer: Install VS2008 runtimes merge modules.

13 years agoDrop Ansi config from x64 project
Tim Gerundt [Sun, 5 Sep 2010 09:21:22 +0000 (09:21 +0000)]
Drop Ansi config from x64 project

13 years agoBUG: [ 3022292 ] Location pane focus enabled "Save"
Tim Gerundt [Fri, 3 Sep 2010 19:39:48 +0000 (19:39 +0000)]
BUG: [ 3022292 ] Location pane focus enabled "Save"

13 years agoBUG: [ 3033325 ] copy and advance: toolbar icons not automatically enabled
Tim Gerundt [Fri, 3 Sep 2010 19:07:04 +0000 (19:07 +0000)]
BUG: [ 3033325 ] copy and advance: toolbar icons not automatically enabled

13 years agoBUG: [ 3033324 ] Chinese (trad.): "Alt + <key>" has extra space
Tim Gerundt [Fri, 3 Sep 2010 15:21:15 +0000 (15:21 +0000)]
BUG: [ 3033324 ] Chinese (trad.): "Alt + <key>" has extra space

13 years agoPATCH: #3025078 Installer: Drop Windows 9x/ME/NT4 support from InnoSetup
Tim Gerundt [Wed, 1 Sep 2010 05:42:35 +0000 (05:42 +0000)]
PATCH: #3025078 Installer: Drop Windows 9x/ME/NT4 support from InnoSetup

13 years agoPATCH: #3046938 Improvement in Folder comparison
Kimmo Varis [Tue, 31 Aug 2010 18:03:24 +0000 (18:03 +0000)]
PATCH: #3046938 Improvement in  Folder comparison
 Submitted by Saitaman

14 years agoPATCH: #3042393 Recognize .ascx files as ASP files
Kimmo Varis [Wed, 11 Aug 2010 15:46:04 +0000 (15:46 +0000)]
PATCH: #3042393 Recognize .ascx files as ASP files

14 years agoPATCH: #3034083 Improvement in filter comments
Kimmo Varis [Thu, 5 Aug 2010 19:50:57 +0000 (19:50 +0000)]
PATCH: #3034083 Improvement in filter comments
 Submitted by saitaman@sourceforge

14 years agoPATCH: #2929005 Quickcompare and EOL
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.

14 years agoPATCH: [ 3025202 ] French translation
Tim Gerundt [Sat, 17 Jul 2010 15:17:13 +0000 (15:17 +0000)]
PATCH: [ 3025202 ] French translation

14 years agoBUG: #3027893 Relase fails with VS2008 since rev.7215
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.

14 years agoBUG: [ 2794137 ] WinMerge.INI importing has problem...
Takashi Sawanaka [Thu, 8 Jul 2010 14:48:44 +0000 (14:48 +0000)]
BUG: [ 2794137 ] WinMerge.INI importing has problem...

14 years agoBUG: [ 3025855 ] Untranslated strings in folder compare window
Takashi Sawanaka [Thu, 8 Jul 2010 14:44:15 +0000 (14:44 +0000)]
BUG: [ 3025855 ] Untranslated strings in folder compare window

14 years agoPATCH: [ 3017741 ] Fix readonly logic for ClearCase integration
Jochen Tucht [Sun, 4 Jul 2010 18:55:49 +0000 (18:55 +0000)]
PATCH: [ 3017741 ] Fix readonly logic for ClearCase integration

14 years agoMake DIFFRANGE::op and respective function parameters type-safe
Jochen Tucht [Sun, 4 Jul 2010 18:46:04 +0000 (18:46 +0000)]
Make DIFFRANGE::op and respective function parameters type-safe

14 years agoFix a signed vs. unsigned warning
Jochen Tucht [Sun, 4 Jul 2010 11:02:24 +0000 (11:02 +0000)]
Fix a signed vs. unsigned warning

14 years agoPATCH: #3022014 Stingdiffs more detail on char level
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.

14 years agoRemove unwanted copy-paste leftovers
Jochen Tucht [Sat, 3 Jul 2010 13:02:59 +0000 (13:02 +0000)]
Remove unwanted copy-paste leftovers

14 years agoFixing 64-bit build warnings.
Kimmo Varis [Thu, 1 Jul 2010 15:40:16 +0000 (15:40 +0000)]
Fixing 64-bit build warnings.

14 years agoFixing 64-bit build warnings.
Kimmo Varis [Thu, 1 Jul 2010 14:54:51 +0000 (14:54 +0000)]
Fixing 64-bit build warnings.

14 years agoFixing 64-bit compile warnings.
Kimmo Varis [Thu, 1 Jul 2010 13:30:43 +0000 (13:30 +0000)]
Fixing 64-bit compile warnings.

14 years agoFix 64-bit build warnings in BCMenu.
Kimmo Varis [Thu, 1 Jul 2010 12:49:38 +0000 (12:49 +0000)]
Fix 64-bit build warnings in BCMenu.

14 years agoFix some 64-bit build warnings.
Kimmo Varis [Thu, 1 Jul 2010 10:59:36 +0000 (10:59 +0000)]
Fix some 64-bit build warnings.

14 years agoWin64: Put temp build files to BuildTmp folder as 32-bit builds do.
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.

14 years agoUpdate SCEW to 1.1.2
Kimmo Varis [Thu, 1 Jul 2010 08:36:46 +0000 (08:36 +0000)]
Update SCEW to 1.1.2

14 years agoPATCH: [ 3012200 ] Defer unicode conversion to diffutils
Jochen Tucht [Wed, 30 Jun 2010 05:34:17 +0000 (05:34 +0000)]
PATCH: [ 3012200 ] Defer unicode conversion to diffutils

14 years agoUpdate to PCRE 8.10.
Kimmo Varis [Tue, 29 Jun 2010 21:11:39 +0000 (21:11 +0000)]
Update to PCRE 8.10.

14 years agoFix post build event for "X64 Debug" and "X64 Release" in pcreX64.vcproj
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

14 years agoFix post build event for "X64 Debug" and "X64 Release" in expatX64.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

14 years agoFix translation paths in MergeLangX64.vcproj
Tim Gerundt [Mon, 28 Jun 2010 10:58:17 +0000 (10:58 +0000)]
Fix translation paths in MergeLangX64.vcproj

14 years agoFix InnoSetup installer file by adding missing semicolon.
Kimmo Varis [Sat, 19 Jun 2010 13:51:51 +0000 (13:51 +0000)]
Fix InnoSetup installer file by adding missing semicolon.

14 years agoWinMerge experimental release 2.13.13. (SVN r7205)
Kimmo Varis [Sat, 19 Jun 2010 13:02:44 +0000 (13:02 +0000)]
WinMerge experimental release 2.13.13. (SVN r7205)

14 years agoFix typo in release script.
Kimmo Varis [Sat, 19 Jun 2010 13:00:23 +0000 (13:00 +0000)]
Fix typo in release script.

14 years agoBump WinMerge version to 2.13.13 and Shellextension version to 1.16.3.
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.

14 years agoTranslations: Update WinMerge POT and PO files.
Kimmo Varis [Sat, 19 Jun 2010 12:46:49 +0000 (12:46 +0000)]
Translations: Update WinMerge POT and PO files.

14 years agoChangelog: add recent bug fixes and improvements.
Kimmo Varis [Sat, 19 Jun 2010 12:41:51 +0000 (12:41 +0000)]
Changelog: add recent bug fixes and improvements.

14 years agoRestore changelog line that got removed when backing out patch.
Kimmo Varis [Sat, 19 Jun 2010 12:23:00 +0000 (12:23 +0000)]
Restore changelog line that got removed when backing out patch.

14 years agoUpdate of translation
Jan Hryz [Sat, 19 Jun 2010 07:40:16 +0000 (07:40 +0000)]
Update of translation

14 years agoPATCH: [ 3017674 ] New Serbian Language - Add ShellExtension changes
Tim Gerundt [Thu, 17 Jun 2010 20:16:49 +0000 (20:16 +0000)]
PATCH: [ 3017674 ] New Serbian Language - Add ShellExtension changes

14 years agoPATCH: [ 3017674 ] New Serbian Language
Tim Gerundt [Thu, 17 Jun 2010 19:37:02 +0000 (19:37 +0000)]
PATCH: [ 3017674 ] New Serbian Language

14 years agoPATCH: [ 3014912 ] Installer: Set default language with MSI setup
Tim Gerundt [Thu, 17 Jun 2010 16:40:17 +0000 (16:40 +0000)]
PATCH: [ 3014912 ] Installer: Set default language with MSI setup

14 years agoPATCH: [ 3016907 ] Fix Bug #2968177 Ignoring comments wrongly recognizes // ...
Jochen Tucht [Thu, 17 Jun 2010 05:47:45 +0000 (05:47 +0000)]
PATCH: [ 3016907 ] Fix Bug #2968177 Ignoring comments wrongly recognizes // ...

14 years agoFix regression from MFC to STL string conversion committed as of revision 6865.
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.

14 years agoAdd Merge7z914 to Merge7zInstaller
Jochen Tucht [Sun, 13 Jun 2010 20:02:50 +0000 (20:02 +0000)]
Add Merge7z914 to Merge7zInstaller

14 years agoAdd Merge7z914.vcxproj
Jochen Tucht [Sun, 13 Jun 2010 20:01:22 +0000 (20:01 +0000)]
Add Merge7z914.vcxproj

14 years agofix a warning
Jochen Tucht [Sun, 13 Jun 2010 15:22:21 +0000 (15:22 +0000)]
fix a warning

14 years agoFix last commit breaking compilation due to "struct stat" vs. "struct _stat".
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".

14 years agoBUG: [ 2982964 ] Wrong time stamp even in latest revision (NOT old bug)
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)

14 years agoCSortHeaderCtrl: Replace GetDllVersion() by SendMessage(CCM_GETVERSION), which works...
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.

14 years agoRemove unnecessary #include "dllver.h"
Jochen Tucht [Sun, 13 Jun 2010 12:10:45 +0000 (12:10 +0000)]
Remove unnecessary #include "dllver.h"

14 years agoPATCH: [ 3015416 ] LineFiltersDlg: Employ listview in-place editing capability
Jochen Tucht [Sun, 13 Jun 2010 10:20:59 +0000 (10:20 +0000)]
PATCH: [ 3015416 ] LineFiltersDlg: Employ listview in-place editing capability

14 years agoPATCH: [ 3015396 ] Remove obsolete dll version checks
Jochen Tucht [Sun, 13 Jun 2010 10:13:37 +0000 (10:13 +0000)]
PATCH: [ 3015396 ] Remove obsolete dll version checks

14 years agoCMergeDiffDetailView: Fix an inconsistency in m_lineBegin vs. m_lineEnd vs. m_diffLen...
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.

14 years agoUpdate 2.12.4 release notes to trunk.
Kimmo Varis [Sun, 13 Jun 2010 08:25:01 +0000 (08:25 +0000)]
Update 2.12.4 release notes to trunk.

14 years agoBuildscript: Use Python's optparse module to parse command line.
Kimmo Varis [Sat, 12 Jun 2010 13:00:33 +0000 (13:00 +0000)]
Buildscript: Use Python's optparse module to parse command line.

14 years agoBUG: #2995925 No refreshing after merging difference
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.

14 years agoFix the changelog item - use the patch ID when it exists.
Kimmo Varis [Sat, 12 Jun 2010 09:58:16 +0000 (09:58 +0000)]
Fix the changelog item - use the patch ID when it exists.

14 years agoChangelog: Bugfix: Line filtering wasted huge amounts of memory
Kimmo Varis [Sat, 12 Jun 2010 09:56:48 +0000 (09:56 +0000)]
Changelog: Bugfix: Line filtering wasted huge amounts of memory

14 years agoPATCH: [ 3014162 ] Fix LineFilters wasting enormous 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

14 years agoHexMergeView: Differences could fail to show up in left pane unless some action was...
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).

14 years agoFix an apparent bug in to_utf8_advance()
Jochen Tucht [Sun, 6 Jun 2010 13:41:33 +0000 (13:41 +0000)]
Fix an apparent bug in to_utf8_advance()

14 years agoVC2010 does not accept a dot to serve as a class resolution operator
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

14 years agoFix some batch files paths in Merge.vcproj
Tim Gerundt [Wed, 2 Jun 2010 06:24:43 +0000 (06:24 +0000)]
Fix some batch files paths in Merge.vcproj

14 years agoFix CreateMasterPotFile calls in MergeLangX64.vcproj
Tim Gerundt [Wed, 2 Jun 2010 06:19:33 +0000 (06:19 +0000)]
Fix CreateMasterPotFile calls in MergeLangX64.vcproj

14 years agoRestart discussion about binary file detection (TODO #1946860)
Jochen Tucht [Wed, 19 May 2010 12:57:18 +0000 (12:57 +0000)]
Restart discussion about binary file detection (TODO #1946860)

14 years agoFix possible access beyond end of memory mapped file
Jochen Tucht [Wed, 19 May 2010 12:25:14 +0000 (12:25 +0000)]
Fix possible access beyond end of memory mapped file

14 years agostring_replace(): Fix infinite loop if (replace) contains an occurrence of (find...
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).

14 years ago• Read 7-Zip version from 7z.dll (which has long ago replaced the various format...
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

14 years agoVC2010 does not accept a dot to serve as a class resolution operator
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

14 years agoRelate definition of NCHITTEST_RESULT to _MFC_VER, not _MSC_VER, to enable use of...
Jochen Tucht [Sun, 16 May 2010 13:15:33 +0000 (13:15 +0000)]
Relate definition of NCHITTEST_RESULT to _MFC_VER, not _MSC_VER, to enable use of VS2010 Express in conjunction with MFC71

14 years agoHexMerge issues:
Jochen Tucht [Sun, 16 May 2010 12:05:13 +0000 (12:05 +0000)]
HexMerge issues:
• Fix initial child frame size when opening HexMerge from command line (not supported by now, but on my personal agenda)
• Child frame caption included entire path, which was not quite the intention

14 years agoBUGFIX: HexMergeView was unable to load an empty file.
Jochen Tucht [Sat, 15 May 2010 14:04:43 +0000 (14:04 +0000)]
BUGFIX: HexMergeView was unable to load an empty file.

14 years agofix a warning
Jochen Tucht [Sat, 15 May 2010 13:57:32 +0000 (13:57 +0000)]
fix a warning

14 years agofix a warning
Jochen Tucht [Sat, 15 May 2010 13:20:17 +0000 (13:20 +0000)]
fix a warning

14 years agofix a warning
Jochen Tucht [Sat, 15 May 2010 13:14:27 +0000 (13:14 +0000)]
fix a warning

14 years agofix a warning
Jochen Tucht [Sat, 15 May 2010 13:08:22 +0000 (13:08 +0000)]
fix a warning

14 years agoFix manual URL in Merge7z/readme.txt
Tim Gerundt [Sat, 15 May 2010 12:48:38 +0000 (12:48 +0000)]
Fix manual URL in Merge7z/readme.txt

14 years agofix a warning
Jochen Tucht [Sat, 15 May 2010 12:44:12 +0000 (12:44 +0000)]
fix a warning

14 years agoMerge7zInstaller: Base application specific installation on 7z465
Jochen Tucht [Thu, 13 May 2010 12:04:45 +0000 (12:04 +0000)]
Merge7zInstaller: Base application specific installation on 7z465

14 years agoAdd Merge7zInstaller.vcxproj.* for VS2010
Jochen Tucht [Thu, 13 May 2010 11:38:03 +0000 (11:38 +0000)]
Add Merge7zInstaller.vcxproj.* for VS2010

14 years agoMerge7z DllBuild 0028
Jochen Tucht [Sun, 9 May 2010 21:42:02 +0000 (21:42 +0000)]
Merge7z DllBuild 0028

14 years agoRevert patch #2988369.
Kimmo Varis [Sun, 9 May 2010 12:06:24 +0000 (12:06 +0000)]
Revert patch #2988369.

14 years agoJapanese translation - update
Takashi Sawanaka [Thu, 6 May 2010 17:49:21 +0000 (17:49 +0000)]
Japanese translation - update

14 years agoPATCH: #2919510 TimeSizecompare
Kimmo Varis [Tue, 4 May 2010 18:11:48 +0000 (18:11 +0000)]
PATCH: #2919510 TimeSizecompare
 Submitted by Matthias Mayer
 Comparing files by size also always compared by time.

14 years agoPATCH: #2988369 FileFilterHelper using PCRE
Kimmo Varis [Tue, 4 May 2010 17:46:42 +0000 (17:46 +0000)]
PATCH: #2988369 FileFilterHelper using PCRE
 Submitted by Matthias Mayer
 Allows MS-DOS style pattern matching for Open-dialog filters.

14 years agoRemove old VS2003 runtime files.
Kimmo Varis [Tue, 4 May 2010 17:28:11 +0000 (17:28 +0000)]
Remove old VS2003 runtime files.

14 years agoInstaller: Embed MS runtime files installer for x64
Kimmo Varis [Tue, 4 May 2010 17:26:43 +0000 (17:26 +0000)]
Installer: Embed MS runtime files installer for x64

14 years agoBUG: #2991932 delete[] applied to memory allocated by _tcsdup()
Kimmo Varis [Mon, 3 May 2010 17:08:20 +0000 (17:08 +0000)]
BUG: #2991932 delete[] applied to memory allocated by _tcsdup()
 Spotted by Jochen.

14 years agoWinMerge experimental release 2.13.12. (SVN r7148)
Kimmo Varis [Thu, 29 Apr 2010 16:43:09 +0000 (16:43 +0000)]
WinMerge experimental release 2.13.12. (SVN r7148)

14 years agoDocs: Add short note about website translation to Translations.html
Tim Gerundt [Thu, 29 Apr 2010 12:42:42 +0000 (12:42 +0000)]
Docs: Add short note about website translation to Translations.html

14 years agoDrop from web files from GetTranslationsStatus.py script
Tim Gerundt [Thu, 29 Apr 2010 09:07:41 +0000 (09:07 +0000)]
Drop from web files from GetTranslationsStatus.py script