OSDN Git Service
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
sdottaka [Sat, 5 Feb 2011 13:17:48 +0000 (22:17 +0900)]
Fix wrong destination path for filters
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
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
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 [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.
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.
sdottaka [Sun, 5 Sep 2010 16:45:50 +0000 (01:45 +0900)]
Added tag 2.13.13+-jp-6 for changeset
9940d96ada2e
sdottaka [Sun, 5 Sep 2010 15:07:51 +0000 (00:07 +0900)]
Make VS2010 build faster
sdottaka [Sun, 5 Sep 2010 15:06:10 +0000 (00:06 +0900)]
Workaround for bug in CImageList::DrawIndirect in MFC100
sdottaka [Sun, 5 Sep 2010 15:03:32 +0000 (00:03 +0900)]
Prevent DLL hijacking
sdottaka [Sun, 5 Sep 2010 14:57:49 +0000 (23:57 +0900)]
Update version numbers
sdottaka [Sun, 5 Sep 2010 14:56:43 +0000 (23:56 +0900)]
Fix incorrect path of ShellExtensionU.dll
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.
sdottaka [Mon, 26 Jul 2010 18:36:53 +0000 (03:36 +0900)]
Added tag 2.13.13+-jp-5 for changeset
b852f0587157
sdottaka [Mon, 26 Jul 2010 18:36:15 +0000 (03:36 +0900)]
Workaround for broken menu icons in WinMerge compiled with Visual Studio 2010
sdottaka [Mon, 26 Jul 2010 18:32:58 +0000 (03:32 +0900)]
Removed tag 2.13.13+-jp-5
sdottaka [Mon, 26 Jul 2010 18:14:01 +0000 (03:14 +0900)]
Added tag 2.13.13+-jp-5 for changeset
1c380c7b081d
sdottaka [Mon, 26 Jul 2010 18:11:56 +0000 (03:11 +0900)]
Display whether the file has a BOM.
sdottaka [Mon, 26 Jul 2010 18:02:43 +0000 (03:02 +0900)]
Fix broken menu in WinMerge compiled with Visual Studio 2010
sdottaka [Mon, 26 Jul 2010 17:50:36 +0000 (02:50 +0900)]
Fix typo in BuildArc.cmd
sdottaka [Mon, 26 Jul 2010 17:49:05 +0000 (02:49 +0900)]
Update version numbers
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.
sdottaka [Sun, 11 Jul 2010 14:06:53 +0000 (23:06 +0900)]
Added tag 2.13.13+-jp-3 for changeset
4e8c4ab0c924