OSDN Git Service
sdottaka [Sun, 15 May 2011 11:50:43 +0000 (20:50 +0900)]
Fix mixed EOL
sdottaka [Sat, 7 May 2011 10:05:03 +0000 (19:05 +0900)]
Fix mixed EOL
sdottaka [Sat, 7 May 2011 09:57:42 +0000 (18:57 +0900)]
Add encoding error dialog for encoding error
sdottaka [Wed, 4 May 2011 12:10:23 +0000 (21:10 +0900)]
Revert unintentional fix
sdottaka [Wed, 4 May 2011 02:26:25 +0000 (11:26 +0900)]
Fix mixed EOL
sdottaka [Mon, 2 May 2011 13:02:47 +0000 (22:02 +0900)]
Added tag 2.13.13+-jp-11 for changeset
44f8738653d9
sdottaka [Mon, 2 May 2011 12:48:12 +0000 (21:48 +0900)]
add forgotten files
sdottaka [Mon, 2 May 2011 12:28:17 +0000 (21:28 +0900)]
Use MergeEditView instead of MergeDiffDetailView to support word wrap in diff pane
sdottaka [Mon, 2 May 2011 12:27:58 +0000 (21:27 +0900)]
Fix some warnings
sdottaka [Mon, 2 May 2011 11:59:24 +0000 (20:59 +0900)]
Use MergeEditView instead of MergeDiffDetailView to support word wrap in diff pane
sdottaka [Mon, 2 May 2011 07:58:59 +0000 (16:58 +0900)]
Fix mixed EOL
sdottaka [Thu, 28 Apr 2011 13:03:04 +0000 (22:03 +0900)]
Merge rev.7791
sdottaka [Tue, 26 Apr 2011 15:07:09 +0000 (00:07 +0900)]
Added 'Split Vertically' menu item
sdottaka [Sun, 17 Apr 2011 10:13:56 +0000 (19:13 +0900)]
Added tag 2.13.13+-jp-12 for changeset
a66e9d5fee7e
sdottaka [Sun, 17 Apr 2011 00:31:39 +0000 (09:31 +0900)]
Fix: WinMerge ignores a line without ## comment at the end of the line in file filter.
Fix: file filter without "d: ..." (all f:) or without "f: ..." (all d:) does not work properly.
sdottaka [Sun, 17 Apr 2011 00:00:00 +0000 (09:00 +0900)]
delete *.res files before building
sdottaka [Sat, 16 Apr 2011 23:57:08 +0000 (08:57 +0900)]
Fix wrong destination path for lang files
sdottaka [Sat, 16 Apr 2011 23:49:03 +0000 (08:49 +0900)]
Update version numbers
sdottaka [Sun, 13 Mar 2011 15:22:56 +0000 (00:22 +0900)]
Added tag 2.13.13+-JP-11 for changeset
44f8738653d9
sdottaka [Sun, 13 Mar 2011 15:19:02 +0000 (00:19 +0900)]
Update version numbers
sdottaka [Sun, 13 Mar 2011 15:18:53 +0000 (00:18 +0900)]
Fix: fail to detect utf-8 file
sdottaka [Sun, 27 Feb 2011 19:31:41 +0000 (04:31 +0900)]
Added tag 2.13.13+-jp-10 for changeset
600b1f9cd6d9
sdottaka [Sun, 27 Feb 2011 19:30:08 +0000 (04:30 +0900)]
Update version numbers
sdottaka [Sun, 27 Feb 2011 19:26:08 +0000 (04:26 +0900)]
Fix crash when specifying more than 4 files or folders in command line.
sdottaka [Sun, 27 Feb 2011 19:24:20 +0000 (04:24 +0900)]
Fix crash when clicking [Help] menu item on WinMerge x64 version
sdottaka [Sun, 27 Feb 2011 19:20:38 +0000 (04:20 +0900)]
Added tag 2.13.13+-jp-9 for changeset
2aeaf21d60b7
sdottaka [Sun, 27 Feb 2011 19:18:30 +0000 (04:18 +0900)]
Bug fix: WinMerge often failed to load plugin in comparing folders
sdottaka [Sun, 27 Feb 2011 19:04:36 +0000 (04:04 +0900)]
delete old 7-zip plugin
sdottaka [Sun, 27 Feb 2011 14:15:48 +0000 (23:15 +0900)]
Merge from SVN rev.7517
Add x64 platform configuration
Jochen Tucht [Sun, 6 Feb 2011 19:30:24 +0000 (19:30 +0000)]
Add missing file
sdottaka [Sat, 5 Feb 2011 13:17:48 +0000 (22:17 +0900)]
Fix wrong destination path for filters
Jochen Tucht [Sun, 30 Jan 2011 11:56:57 +0000 (11:56 +0000)]
Respect diffutils code formatting
Tim Gerundt [Fri, 28 Jan 2011 20:12:55 +0000 (20:12 +0000)]
PATCH: [
3164982 ] Hungarian language file
Submitted by Mihalicza József
Tim Gerundt [Fri, 21 Jan 2011 08:42:41 +0000 (08:42 +0000)]
Fixing 64-bit build warnings.
sdottaka [Sat, 8 Jan 2011 13:29:55 +0000 (22:29 +0900)]
Merge Tim's fix-x64-warnings-in-bcmenu patch
sdottaka [Sat, 8 Jan 2011 13:23:28 +0000 (22:23 +0900)]
Fix some x64 compiler warnings in BCMenu.cpp
sdottaka [Sat, 8 Jan 2011 12:32:21 +0000 (21:32 +0900)]
Merge from rev.7448
Tim Gerundt [Tue, 4 Jan 2011 15:53:22 +0000 (15:53 +0000)]
Update copyright to 2011
sdottaka [Sun, 2 Jan 2011 05:45:58 +0000 (14:45 +0900)]
Applies changed compare method to DiffContext when recomparing folders
sdottaka [Sun, 2 Jan 2011 05:23:26 +0000 (14:23 +0900)]
Fix typo in /wm option description
Jochen Tucht [Sat, 25 Dec 2010 22:26:00 +0000 (22:26 +0000)]
Add versions 7z918 through 7z920 to Merge7zInstaller, and base application specific installation on 7z920.
Jochen Tucht [Sat, 25 Dec 2010 22:21:39 +0000 (22:21 +0000)]
Add Merge7z*.vcxproj files 918 through 920
Tim Gerundt [Mon, 20 Dec 2010 21:06:57 +0000 (21:06 +0000)]
Move Wiki to wiki.winmerge.org
Tim Gerundt [Mon, 20 Dec 2010 12:22:56 +0000 (12:22 +0000)]
Move HTML version of WinMerge Help to manual.winmerge.org
Tim Gerundt [Wed, 8 Dec 2010 09:38:36 +0000 (09:38 +0000)]
Drop WinMerge.exe.manifest
Tim Gerundt [Tue, 7 Dec 2010 20:45:10 +0000 (20:45 +0000)]
Fix whitespace
Tim Gerundt [Mon, 6 Dec 2010 07:04:47 +0000 (07:04 +0000)]
PATCH: [
3126794 ] Set icon in Add/Remove Programs with MSI setup
Tim Gerundt [Mon, 6 Dec 2010 06:55:47 +0000 (06:55 +0000)]
PATCH: [
3117406 ] Drop GetClipTcharTextFormat() function
Tim Gerundt [Wed, 1 Dec 2010 18:10:54 +0000 (18:10 +0000)]
Installer: Install VS2008 runtimes merge modules. - Change feature title also to 2008
Tim Gerundt [Wed, 24 Nov 2010 07:57:25 +0000 (07:57 +0000)]
PATCH: [
3116407 ] Drop _UNICODE preprocessor definition
Tim Gerundt [Wed, 24 Nov 2010 07:18:55 +0000 (07:18 +0000)]
PATCH: [
3116422 ] Drop dirtools.[cpp|h]
Tim Gerundt [Mon, 22 Nov 2010 13:06:28 +0000 (13:06 +0000)]
PATCH: [
3114642 ] Drop IsLeadByte() function
Tim Gerundt [Mon, 22 Nov 2010 12:43:03 +0000 (12:43 +0000)]
PATCH: [
3114577 ] Drop IsUnicodeBuild() function
Tim Gerundt [Sun, 21 Nov 2010 17:42:27 +0000 (17:42 +0000)]
PATCH: [
3109521 ] Crash after deleting text
Submitted by Lars Wittenburg
Tim Gerundt [Sun, 21 Nov 2010 13:34:03 +0000 (13:34 +0000)]
PATCH: [
3111581 ] Keeps verifing path even turned off in options
Tim Gerundt [Sat, 20 Nov 2010 12:20:37 +0000 (12:20 +0000)]
PATCH: [
3109525 ] Crash when pasting from clipboard
Submitted by Lars Wittenburg
Tim Gerundt [Sat, 20 Nov 2010 11:52:43 +0000 (11:52 +0000)]
PATCH: [
3104374 ] Drop UNICODE preprocessor definition
sdottaka [Sun, 14 Nov 2010 13:45:07 +0000 (22:45 +0900)]
Added tag 2.13.13+-jp-8 for changeset
39c3ec2138cd
sdottaka [Sun, 14 Nov 2010 13:43:08 +0000 (22:43 +0900)]
Update version numbers
sdottaka [Sun, 14 Nov 2010 13:42:44 +0000 (22:42 +0900)]
Fix crash when restoring from minimized window
sdottaka [Sun, 14 Nov 2010 13:40:38 +0000 (22:40 +0900)]
Support surrogate pairs in filename
Tim Gerundt [Sat, 6 Nov 2010 20:00:20 +0000 (20:00 +0000)]
BUG: [
3070151 ] WinMerge 2.13.14 don't show menu icons - Add change log entry
Tim Gerundt [Sat, 6 Nov 2010 18:47:43 +0000 (18:47 +0000)]
BUG: [
3070151 ] WinMerge 2.13.14 don't show menu icons
Tim Gerundt [Sat, 6 Nov 2010 18:11:08 +0000 (18:11 +0000)]
Disable patch #
3026022 for WIN64 due to issues as per bug #
3089575
Tim Gerundt [Wed, 3 Nov 2010 17:10:16 +0000 (17:10 +0000)]
PATCH: [
3099867 ] Drop Ansi config from ShellExtension project
Jochen Tucht [Mon, 1 Nov 2010 11:53:31 +0000 (11:53 +0000)]
Set Merge7zInstaller's UAC execution level to RequireAdministrator
Jochen Tucht [Mon, 1 Nov 2010 11:50:12 +0000 (11:50 +0000)]
Add versions 7z915 through 7z917 to Merge7zInstaller
Jochen Tucht [Mon, 1 Nov 2010 11:39:37 +0000 (11:39 +0000)]
Add Merge7z*.vcxproj files 915 through 917
Tim Gerundt [Sun, 31 Oct 2010 13:17:39 +0000 (13:17 +0000)]
Drop ANSI config from PreLink.bat
Jochen Tucht [Sun, 31 Oct 2010 10:37:58 +0000 (10:37 +0000)]
IDR_POPUP_DIRVIEW MENU - revised wording as discussed in forum
Kimmo Varis [Wed, 27 Oct 2010 19:40:45 +0000 (19:40 +0000)]
BuildScript: Specify Win32 target for 32-bit ShellExtension.
Kimmo Varis [Wed, 27 Oct 2010 18:36:46 +0000 (18:36 +0000)]
BuildScript: Fix creating InnoSetup installer.
Need to CD to InnoSetup installer file's folder before building the installer.
Kimmo Varis [Wed, 27 Oct 2010 16:40:58 +0000 (16:40 +0000)]
Remove unneeded ShellExtensionX64.vcproj project file and
update 64-bit ShellExtension compiling instructions.
Kimmo Varis [Wed, 27 Oct 2010 15:55:19 +0000 (15:55 +0000)]
Scripts: Make ToolSettings.py to work in 64-bit Windows.
Tim Gerundt [Tue, 26 Oct 2010 06:07:27 +0000 (06:07 +0000)]
PATCH: [
3095046 ] Drop Ansi config from x86 project
Jochen Tucht [Tue, 26 Oct 2010 02:53:23 +0000 (02:53 +0000)]
PATCH: [
3026022 ] Turn STL exceptions into MFC exceptions - fix rethrow
Tim Gerundt [Mon, 25 Oct 2010 16:36:42 +0000 (16:36 +0000)]
PATCH: [
3093207 ] Delete dllver files
Tim Gerundt [Mon, 25 Oct 2010 08:12:00 +0000 (08:12 +0000)]
Fix UsePrecompiledHeader for CompareStats.cpp in UnicodeRelease|x64 from MergeX64.vcproj
Jochen Tucht [Sun, 24 Oct 2010 11:59:07 +0000 (11:59 +0000)]
stringdiffs: Avoid unnecessary std::vector copy construction.
Jochen Tucht [Sun, 24 Oct 2010 07:57:15 +0000 (07:57 +0000)]
Possibly fix a possible 64 bit issue. (Unfortunately I have no way to test this.)
Jochen Tucht [Sat, 23 Oct 2010 15:04:07 +0000 (15:04 +0000)]
PATCH: [
3026022 ] Turn STL exceptions into MFC exceptions
Tim Gerundt [Thu, 21 Oct 2010 23:01:45 +0000 (23:01 +0000)]
Add 2.14 branch to readme-Subversion.html
Christian List [Thu, 21 Oct 2010 00:37:16 +0000 (00:37 +0000)]
Installer: Add OpenCandy to the InnoSetup installer (#
3088720)
Kimmo Varis [Wed, 20 Oct 2010 15:35:39 +0000 (15:35 +0000)]
Scripts: Make VS2008 default when converting project files.
Kimmo Varis [Wed, 20 Oct 2010 15:34:36 +0000 (15:34 +0000)]
Scripts: Support VS2010 in VS project conversion.
Christian List [Sun, 17 Oct 2010 15:58:28 +0000 (15:58 +0000)]
PATCH: [
3088720 ] Add OpenCandy to the InnoSetup installer
This is using the OpenCandy 1.4.2.28 Inno SDK.
The WinMerge.iss is including a file OpenCandyKeys.iss which is not included. This file contains the private keys for WinMerge, and can be obtained from the WinMerge administrators if you are creating the WinMerge releases.
If you just want to use the installer without the WinMerge keys, then remove this line:
#include <OpenCandyKeys.iss>
This makes the installer compile with default demo keys instead of the WinMerge specific keys.
sdottaka [Thu, 14 Oct 2010 16:38:31 +0000 (01:38 +0900)]
Merge Tim's patch (PATCH: [
3079966 ] Installer: Don't install quick launch icon for Windows 7)
sdottaka [Mon, 11 Oct 2010 15:58:12 +0000 (00:58 +0900)]
Added tag 2.13.13+-jp-7 for changeset
5df255b22afc
sdottaka [Mon, 11 Oct 2010 15:27:34 +0000 (00:27 +0900)]
Merge from rev. 7240:7241 (Tim's changes)
sdottaka [Mon, 11 Oct 2010 14:24:51 +0000 (23:24 +0900)]
Update version numbers
sdottaka [Mon, 11 Oct 2010 14:10:57 +0000 (23:10 +0900)]
Restore caret y-position when reloading changed files
Tim Gerundt [Fri, 8 Oct 2010 16:11:19 +0000 (16:11 +0000)]
PATCH: [
3082392 ] Updated Bulgarian Language
Tim Gerundt [Wed, 6 Oct 2010 18:35:20 +0000 (20:35 +0200)]
Use command line output for UpdatePoFilesFromPotFile in MergeLangX64.vcproj
Tim Gerundt [Wed, 6 Oct 2010 18:24:12 +0000 (20:24 +0200)]
Use Windows EOL for WinMergeX64.sln (Visual Studio don't open it with Unix EOL)
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.