OSDN Git Service
sdottaka [Tue, 4 Oct 2011 14:58:57 +0000 (23:58 +0900)]
std::vector<wdiff*> -> std::vector<wdiff>
sdottaka [Tue, 4 Oct 2011 14:36:43 +0000 (23:36 +0900)]
Add Basque translation
sdottaka [Sun, 7 Aug 2011 17:55:33 +0000 (02:55 +0900)]
Added tag 2.13.20+-jp-6 for changeset
8a940b9cd9d3
sdottaka [Sun, 7 Aug 2011 17:40:17 +0000 (02:40 +0900)]
fix assertion
sdottaka [Sun, 7 Aug 2011 17:14:05 +0000 (02:14 +0900)]
Update revision number
sdottaka [Sun, 7 Aug 2011 17:13:21 +0000 (02:13 +0900)]
learning about boost::scoped_* ...
sdottaka [Sun, 7 Aug 2011 12:34:36 +0000 (21:34 +0900)]
fix no-redraw problem when resizing the second and the third panes
sdottaka [Wed, 20 Jul 2011 16:58:17 +0000 (01:58 +0900)]
Added tag 2.13.20+-jp-5 for changeset
4ee81ce65d6e
sdottaka [Wed, 20 Jul 2011 16:57:44 +0000 (01:57 +0900)]
Update revision number
sdottaka [Wed, 20 Jul 2011 16:57:01 +0000 (01:57 +0900)]
Refresh combobox list in OpenDialog when clicking Ok button
sdottaka [Wed, 20 Jul 2011 16:51:43 +0000 (01:51 +0900)]
Convert Unicode chars outside BMP to surrogate pairs
sdottaka [Sun, 3 Jul 2011 17:20:25 +0000 (02:20 +0900)]
Added tag 2.13.20+-jp-4 for changeset
a55b18480c08
sdottaka [Sun, 3 Jul 2011 16:42:59 +0000 (01:42 +0900)]
Modal Open Dialog considered harmful.
sdottaka [Sun, 26 Jun 2011 17:43:39 +0000 (02:43 +0900)]
Added tag 2.13.20+-jp-3 for changeset
4e86bcf728a7
sdottaka [Sun, 26 Jun 2011 17:31:49 +0000 (02:31 +0900)]
Fix ANSI build breakage
sdottaka [Sun, 26 Jun 2011 16:32:54 +0000 (01:32 +0900)]
Update revision number
sdottaka [Sun, 26 Jun 2011 16:32:41 +0000 (01:32 +0900)]
Merge from rev.7551 on SVN
sdottaka [Sun, 26 Jun 2011 16:13:21 +0000 (01:13 +0900)]
Merge from rev.7551 on SVN
sdottaka [Sun, 26 Jun 2011 16:12:38 +0000 (01:12 +0900)]
Merge from rev.7551 on SVN
sdottaka [Sun, 26 Jun 2011 16:03:25 +0000 (01:03 +0900)]
Prevent from showing inline-diff at moved block line.
sdottaka [Sun, 26 Jun 2011 13:04:51 +0000 (22:04 +0900)]
PATCH: [
3066200] PatchDlg swap files (submitted by Matthias)
sdottaka [Sun, 26 Jun 2011 12:38:20 +0000 (21:38 +0900)]
Revert a patch for 'RFE [
1205516] Comparing compressed Archive Variants'. I think it causes unexpected folder compare result.
sdottaka [Sun, 26 Jun 2011 12:25:40 +0000 (21:25 +0900)]
choose help language from current winmerge language but not system language
sdottaka [Sun, 22 May 2011 15:57:57 +0000 (00:57 +0900)]
Added tag 2.13.20+-jp-2 for changeset
43d23bb14437
sdottaka [Sun, 22 May 2011 15:56:59 +0000 (00:56 +0900)]
Update revision number
sdottaka [Sun, 22 May 2011 15:56:44 +0000 (00:56 +0900)]
fix drawing doubled EOL marker
sdottaka [Sun, 22 May 2011 15:52:43 +0000 (00:52 +0900)]
Fix printing garbage area
sdottaka [Mon, 16 May 2011 16:21:11 +0000 (01:21 +0900)]
Added tag 2.13.20+-jp-1 for changeset
740dfb105fd0
sdottaka [Sun, 15 May 2011 15:39:46 +0000 (00:39 +0900)]
Update revision number
sdottaka [Sun, 15 May 2011 15:36:27 +0000 (00:36 +0900)]
expand scope of word level diff from one line to one diff block (n lines)
sdottaka [Sun, 15 May 2011 14:12:30 +0000 (23:12 +0900)]
Move STRINGDIFF_LOGGING macro to stringdiffsi.h
sdottaka [Sun, 15 May 2011 14:10:08 +0000 (23:10 +0900)]
Fix assertion when clicking OK button in Codepage category
sdottaka [Sun, 15 May 2011 14:03:53 +0000 (23:03 +0900)]
Add Hex view button to Encoding Error Dialog
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