OSDN Git Service

winmerge-jp/winmerge-jp.git
12 years agoUpdate revisions 2.13.20+-jp-7
sdottaka [Mon, 10 Oct 2011 17:13:04 +0000 (02:13 +0900)]
Update revisions

12 years agoFix build failure of Manual_ja
sdottaka [Mon, 10 Oct 2011 17:12:50 +0000 (02:12 +0900)]
Fix build failure of Manual_ja

12 years agoFix build failure of ShellExtension
sdottaka [Mon, 10 Oct 2011 17:09:49 +0000 (02:09 +0900)]
Fix build failure of ShellExtension

12 years agoMerge from github.com/tacahiroy/WinMerge-Docs-ja/
sdottaka [Mon, 10 Oct 2011 14:25:09 +0000 (23:25 +0900)]
Merge from github.com/tacahiroy/WinMerge-Docs-ja/

12 years agoFix copying non-double-null-terminated string of file names to clipboard
sdottaka [Mon, 10 Oct 2011 14:15:41 +0000 (23:15 +0900)]
Fix copying non-double-null-terminated string of file names to clipboard

12 years agostd::vector<wdiff*> -> std::vector<wdiff>
sdottaka [Tue, 4 Oct 2011 15:19:05 +0000 (00:19 +0900)]
std::vector<wdiff*> -> std::vector<wdiff>

12 years agostd::vector<wdiff*> -> std::vector<wdiff>
sdottaka [Tue, 4 Oct 2011 14:58:57 +0000 (23:58 +0900)]
std::vector<wdiff*> -> std::vector<wdiff>

12 years agoAdd Basque translation
sdottaka [Tue, 4 Oct 2011 14:36:43 +0000 (23:36 +0900)]
Add Basque translation

12 years agoAdded tag 2.13.20+-jp-6 for changeset 8a940b9cd9d3
sdottaka [Sun, 7 Aug 2011 17:55:33 +0000 (02:55 +0900)]
Added tag 2.13.20+-jp-6 for changeset 8a940b9cd9d3

12 years agofix assertion 2.13.20+-jp-6
sdottaka [Sun, 7 Aug 2011 17:40:17 +0000 (02:40 +0900)]
fix assertion

12 years agoUpdate revision number
sdottaka [Sun, 7 Aug 2011 17:14:05 +0000 (02:14 +0900)]
Update revision number

12 years agolearning about boost::scoped_* ...
sdottaka [Sun, 7 Aug 2011 17:13:21 +0000 (02:13 +0900)]
learning about boost::scoped_* ...

12 years agofix no-redraw problem when resizing the second and the third panes
sdottaka [Sun, 7 Aug 2011 12:34:36 +0000 (21:34 +0900)]
fix no-redraw problem when resizing the second and the third panes

13 years agoAdded tag 2.13.20+-jp-5 for changeset 4ee81ce65d6e
sdottaka [Wed, 20 Jul 2011 16:58:17 +0000 (01:58 +0900)]
Added tag 2.13.20+-jp-5 for changeset 4ee81ce65d6e

13 years agoUpdate revision number 2.13.20+-jp-5
sdottaka [Wed, 20 Jul 2011 16:57:44 +0000 (01:57 +0900)]
Update revision number

13 years agoRefresh combobox list in OpenDialog when clicking Ok button
sdottaka [Wed, 20 Jul 2011 16:57:01 +0000 (01:57 +0900)]
Refresh combobox list in OpenDialog when clicking Ok button

13 years agoConvert Unicode chars outside BMP to surrogate pairs
sdottaka [Wed, 20 Jul 2011 16:51:43 +0000 (01:51 +0900)]
Convert Unicode chars outside BMP to surrogate pairs

13 years agoAdded tag 2.13.20+-jp-4 for changeset a55b18480c08
sdottaka [Sun, 3 Jul 2011 17:20:25 +0000 (02:20 +0900)]
Added tag 2.13.20+-jp-4 for changeset a55b18480c08

13 years agoModal Open Dialog considered harmful. 2.13.20+-jp-4
sdottaka [Sun, 3 Jul 2011 16:42:59 +0000 (01:42 +0900)]
Modal Open Dialog considered harmful.

13 years agoAdded tag 2.13.20+-jp-3 for changeset 4e86bcf728a7
sdottaka [Sun, 26 Jun 2011 17:43:39 +0000 (02:43 +0900)]
Added tag 2.13.20+-jp-3 for changeset 4e86bcf728a7

13 years agoFix ANSI build breakage 2.13.20+-jp-3
sdottaka [Sun, 26 Jun 2011 17:31:49 +0000 (02:31 +0900)]
Fix ANSI build breakage

13 years agoUpdate revision number
sdottaka [Sun, 26 Jun 2011 16:32:54 +0000 (01:32 +0900)]
Update revision number

13 years agoMerge from rev.7551 on SVN
sdottaka [Sun, 26 Jun 2011 16:32:41 +0000 (01:32 +0900)]
Merge from rev.7551 on SVN

13 years agoMerge from rev.7551 on SVN
sdottaka [Sun, 26 Jun 2011 16:13:21 +0000 (01:13 +0900)]
Merge from rev.7551 on SVN

13 years agoMerge from rev.7551 on SVN
sdottaka [Sun, 26 Jun 2011 16:12:38 +0000 (01:12 +0900)]
Merge from rev.7551 on SVN

13 years agoPrevent from showing inline-diff at moved block line.
sdottaka [Sun, 26 Jun 2011 16:03:25 +0000 (01:03 +0900)]
Prevent from showing inline-diff at moved block line.

13 years agoPATCH: [3066200] PatchDlg swap files (submitted by Matthias)
sdottaka [Sun, 26 Jun 2011 13:04:51 +0000 (22:04 +0900)]
PATCH: [3066200] PatchDlg swap files (submitted by Matthias)

13 years agoRevert a patch for 'RFE [1205516] Comparing compressed Archive Variants'. I think...
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.

13 years agochoose help language from current winmerge language but not system language
sdottaka [Sun, 26 Jun 2011 12:25:40 +0000 (21:25 +0900)]
choose help language from current winmerge language but not system language

13 years agoAdded tag 2.13.20+-jp-2 for changeset 43d23bb14437
sdottaka [Sun, 22 May 2011 15:57:57 +0000 (00:57 +0900)]
Added tag 2.13.20+-jp-2 for changeset 43d23bb14437

13 years agoUpdate revision number 2.13.20+-jp-2
sdottaka [Sun, 22 May 2011 15:56:59 +0000 (00:56 +0900)]
Update revision number

13 years agofix drawing doubled EOL marker
sdottaka [Sun, 22 May 2011 15:56:44 +0000 (00:56 +0900)]
fix drawing doubled EOL marker

13 years agoFix printing garbage area
sdottaka [Sun, 22 May 2011 15:52:43 +0000 (00:52 +0900)]
Fix printing garbage area

13 years agoAdded tag 2.13.20+-jp-1 for changeset 740dfb105fd0
sdottaka [Mon, 16 May 2011 16:21:11 +0000 (01:21 +0900)]
Added tag 2.13.20+-jp-1 for changeset 740dfb105fd0

13 years agoUpdate revision number 2.13.20+-jp-1
sdottaka [Sun, 15 May 2011 15:39:46 +0000 (00:39 +0900)]
Update revision number

13 years agoexpand scope of word level diff from one line to one diff block (n lines)
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)

13 years agoMove STRINGDIFF_LOGGING macro to stringdiffsi.h
sdottaka [Sun, 15 May 2011 14:12:30 +0000 (23:12 +0900)]
Move STRINGDIFF_LOGGING macro to stringdiffsi.h

13 years agoFix assertion when clicking OK button in Codepage category
sdottaka [Sun, 15 May 2011 14:10:08 +0000 (23:10 +0900)]
Fix assertion when clicking OK button in Codepage category

13 years agoAdd Hex view button to Encoding Error Dialog
sdottaka [Sun, 15 May 2011 14:03:53 +0000 (23:03 +0900)]
Add Hex view button to Encoding Error Dialog

13 years agoFix mixed EOL
sdottaka [Sun, 15 May 2011 11:50:43 +0000 (20:50 +0900)]
Fix mixed EOL

13 years agoFix mixed EOL
sdottaka [Sat, 7 May 2011 10:05:03 +0000 (19:05 +0900)]
Fix mixed EOL

13 years agoAdd encoding error dialog for encoding error
sdottaka [Sat, 7 May 2011 09:57:42 +0000 (18:57 +0900)]
Add encoding error dialog for encoding error

13 years agoRevert unintentional fix
sdottaka [Wed, 4 May 2011 12:10:23 +0000 (21:10 +0900)]
Revert unintentional fix

13 years agoFix mixed EOL
sdottaka [Wed, 4 May 2011 02:26:25 +0000 (11:26 +0900)]
Fix mixed EOL

13 years agoAdded tag 2.13.13+-jp-11 for changeset 44f8738653d9
sdottaka [Mon, 2 May 2011 13:02:47 +0000 (22:02 +0900)]
Added tag 2.13.13+-jp-11 for changeset 44f8738653d9

13 years agoadd forgotten files
sdottaka [Mon, 2 May 2011 12:48:12 +0000 (21:48 +0900)]
add forgotten files

13 years agoUse MergeEditView instead of MergeDiffDetailView to support word wrap in diff pane
sdottaka [Mon, 2 May 2011 12:28:17 +0000 (21:28 +0900)]
Use MergeEditView instead of MergeDiffDetailView to support word wrap in diff pane

13 years agoFix some warnings
sdottaka [Mon, 2 May 2011 12:27:58 +0000 (21:27 +0900)]
Fix some warnings

13 years agoUse MergeEditView instead of MergeDiffDetailView to support word wrap in diff pane
sdottaka [Mon, 2 May 2011 11:59:24 +0000 (20:59 +0900)]
Use MergeEditView instead of MergeDiffDetailView to support word wrap in diff pane

13 years agoFix mixed EOL
sdottaka [Mon, 2 May 2011 07:58:59 +0000 (16:58 +0900)]
Fix mixed EOL

13 years agoMerge rev.7791
sdottaka [Thu, 28 Apr 2011 13:03:04 +0000 (22:03 +0900)]
Merge rev.7791

13 years agoAdded 'Split Vertically' menu item
sdottaka [Tue, 26 Apr 2011 15:07:09 +0000 (00:07 +0900)]
Added 'Split Vertically' menu item

13 years agoAdded tag 2.13.13+-jp-12 for changeset a66e9d5fee7e
sdottaka [Sun, 17 Apr 2011 10:13:56 +0000 (19:13 +0900)]
Added tag 2.13.13+-jp-12 for changeset a66e9d5fee7e

13 years agoFix: WinMerge ignores a line without ## comment at the end of the line in file filter. 2.13.13+-jp-12
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.

13 years agodelete *.res files before building
sdottaka [Sun, 17 Apr 2011 00:00:00 +0000 (09:00 +0900)]
delete *.res files before building

13 years agoFix wrong destination path for lang files
sdottaka [Sat, 16 Apr 2011 23:57:08 +0000 (08:57 +0900)]
Fix wrong destination path for lang files

13 years agoUpdate version numbers
sdottaka [Sat, 16 Apr 2011 23:49:03 +0000 (08:49 +0900)]
Update version numbers

13 years agoAdded tag 2.13.13+-JP-11 for changeset 44f8738653d9
sdottaka [Sun, 13 Mar 2011 15:22:56 +0000 (00:22 +0900)]
Added tag 2.13.13+-JP-11 for changeset 44f8738653d9

13 years agoUpdate version numbers 2.13.13+-jp-11
sdottaka [Sun, 13 Mar 2011 15:19:02 +0000 (00:19 +0900)]
Update version numbers

13 years agoFix: fail to detect utf-8 file
sdottaka [Sun, 13 Mar 2011 15:18:53 +0000 (00:18 +0900)]
Fix: fail to detect utf-8 file

13 years agoAdded tag 2.13.13+-jp-10 for changeset 600b1f9cd6d9
sdottaka [Sun, 27 Feb 2011 19:31:41 +0000 (04:31 +0900)]
Added tag 2.13.13+-jp-10 for changeset 600b1f9cd6d9

13 years agoUpdate version numbers 2.13.13+-jp-10
sdottaka [Sun, 27 Feb 2011 19:30:08 +0000 (04:30 +0900)]
Update version numbers

13 years agoFix crash when specifying more than 4 files or folders in command line.
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.

13 years agoFix crash when clicking [Help] menu item on WinMerge x64 version
sdottaka [Sun, 27 Feb 2011 19:24:20 +0000 (04:24 +0900)]
Fix crash when clicking [Help] menu item on WinMerge x64 version

13 years agoAdded tag 2.13.13+-jp-9 for changeset 2aeaf21d60b7
sdottaka [Sun, 27 Feb 2011 19:20:38 +0000 (04:20 +0900)]
Added tag 2.13.13+-jp-9 for changeset 2aeaf21d60b7

13 years agoBug fix: WinMerge often failed to load plugin in comparing folders 2.13.13+-jp-9
sdottaka [Sun, 27 Feb 2011 19:18:30 +0000 (04:18 +0900)]
Bug fix: WinMerge often failed to load plugin in comparing folders

13 years agodelete old 7-zip plugin
sdottaka [Sun, 27 Feb 2011 19:04:36 +0000 (04:04 +0900)]
delete old 7-zip plugin

13 years agoMerge from SVN rev.7517
sdottaka [Sun, 27 Feb 2011 14:15:48 +0000 (23:15 +0900)]
Merge from SVN rev.7517
Add x64 platform configuration

13 years agoAdd missing file
Jochen Tucht [Sun, 6 Feb 2011 19:30:24 +0000 (19:30 +0000)]
Add missing file

13 years agoFix wrong destination path for filters
sdottaka [Sat, 5 Feb 2011 13:17:48 +0000 (22:17 +0900)]
Fix wrong destination path for filters

13 years agoRespect diffutils code formatting
Jochen Tucht [Sun, 30 Jan 2011 11:56:57 +0000 (11:56 +0000)]
Respect diffutils code formatting

13 years agoPATCH: [ 3164982 ] Hungarian language file
Tim Gerundt [Fri, 28 Jan 2011 20:12:55 +0000 (20:12 +0000)]
PATCH: [ 3164982 ] Hungarian language file
 Submitted by Mihalicza József

13 years agoFixing 64-bit build warnings.
Tim Gerundt [Fri, 21 Jan 2011 08:42:41 +0000 (08:42 +0000)]
Fixing 64-bit build warnings.

13 years agoMerge Tim's fix-x64-warnings-in-bcmenu patch
sdottaka [Sat, 8 Jan 2011 13:29:55 +0000 (22:29 +0900)]
Merge Tim's fix-x64-warnings-in-bcmenu patch

13 years agoFix some x64 compiler warnings in BCMenu.cpp
sdottaka [Sat, 8 Jan 2011 13:23:28 +0000 (22:23 +0900)]
Fix some x64 compiler warnings in BCMenu.cpp

13 years agoMerge from rev.7448
sdottaka [Sat, 8 Jan 2011 12:32:21 +0000 (21:32 +0900)]
Merge from rev.7448

13 years agoUpdate copyright to 2011
Tim Gerundt [Tue, 4 Jan 2011 15:53:22 +0000 (15:53 +0000)]
Update copyright to 2011

13 years agoApplies changed compare method to DiffContext when recomparing folders
sdottaka [Sun, 2 Jan 2011 05:45:58 +0000 (14:45 +0900)]
Applies changed compare method to DiffContext when recomparing folders

13 years agoFix typo in /wm option description
sdottaka [Sun, 2 Jan 2011 05:23:26 +0000 (14:23 +0900)]
Fix typo in /wm option description

13 years agoAdd versions 7z918 through 7z920 to Merge7zInstaller, and base application specific...
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.

13 years agoAdd Merge7z*.vcxproj files 918 through 920
Jochen Tucht [Sat, 25 Dec 2010 22:21:39 +0000 (22:21 +0000)]
Add Merge7z*.vcxproj files 918 through 920

13 years agoMove Wiki to wiki.winmerge.org
Tim Gerundt [Mon, 20 Dec 2010 21:06:57 +0000 (21:06 +0000)]
Move Wiki to wiki.winmerge.org

13 years agoMove HTML version of WinMerge Help to manual.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

13 years agoDrop WinMerge.exe.manifest
Tim Gerundt [Wed, 8 Dec 2010 09:38:36 +0000 (09:38 +0000)]
Drop WinMerge.exe.manifest

13 years agoFix whitespace
Tim Gerundt [Tue, 7 Dec 2010 20:45:10 +0000 (20:45 +0000)]
Fix whitespace

13 years agoPATCH: [ 3126794 ] Set icon in Add/Remove Programs with MSI setup
Tim Gerundt [Mon, 6 Dec 2010 07:04:47 +0000 (07:04 +0000)]
PATCH: [ 3126794 ] Set icon in Add/Remove Programs with MSI setup

13 years agoPATCH: [ 3117406 ] Drop GetClipTcharTextFormat() function
Tim Gerundt [Mon, 6 Dec 2010 06:55:47 +0000 (06:55 +0000)]
PATCH: [ 3117406 ] Drop GetClipTcharTextFormat() function

13 years agoInstaller: Install VS2008 runtimes merge modules. - Change feature title also to...
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

13 years agoPATCH: [ 3116407 ] Drop _UNICODE preprocessor definition
Tim Gerundt [Wed, 24 Nov 2010 07:57:25 +0000 (07:57 +0000)]
PATCH: [ 3116407 ] Drop _UNICODE preprocessor definition

13 years agoPATCH: [ 3116422 ] Drop dirtools.[cpp|h]
Tim Gerundt [Wed, 24 Nov 2010 07:18:55 +0000 (07:18 +0000)]
PATCH: [ 3116422 ] Drop dirtools.[cpp|h]

13 years agoPATCH: [ 3114642 ] Drop IsLeadByte() function
Tim Gerundt [Mon, 22 Nov 2010 13:06:28 +0000 (13:06 +0000)]
PATCH: [ 3114642 ] Drop IsLeadByte() function

13 years agoPATCH: [ 3114577 ] Drop IsUnicodeBuild() function
Tim Gerundt [Mon, 22 Nov 2010 12:43:03 +0000 (12:43 +0000)]
PATCH: [ 3114577 ] Drop IsUnicodeBuild() function

13 years agoPATCH: [ 3109521 ] Crash after deleting text
Tim Gerundt [Sun, 21 Nov 2010 17:42:27 +0000 (17:42 +0000)]
PATCH: [ 3109521 ] Crash after deleting text
 Submitted by Lars Wittenburg

13 years agoPATCH: [ 3111581 ] Keeps verifing path even turned off in options
Tim Gerundt [Sun, 21 Nov 2010 13:34:03 +0000 (13:34 +0000)]
PATCH: [ 3111581 ] Keeps verifing path even turned off in options

13 years agoPATCH: [ 3109525 ] Crash when pasting from clipboard
Tim Gerundt [Sat, 20 Nov 2010 12:20:37 +0000 (12:20 +0000)]
PATCH: [ 3109525 ] Crash when pasting from clipboard
 Submitted by Lars Wittenburg

13 years agoPATCH: [ 3104374 ] Drop UNICODE preprocessor definition
Tim Gerundt [Sat, 20 Nov 2010 11:52:43 +0000 (11:52 +0000)]
PATCH: [ 3104374 ] Drop UNICODE preprocessor definition

13 years agoAdded tag 2.13.13+-jp-8 for changeset 39c3ec2138cd
sdottaka [Sun, 14 Nov 2010 13:45:07 +0000 (22:45 +0900)]
Added tag 2.13.13+-jp-8 for changeset 39c3ec2138cd

13 years agoUpdate version numbers 2.13.13+-jp-8
sdottaka [Sun, 14 Nov 2010 13:43:08 +0000 (22:43 +0900)]
Update version numbers

13 years agoFix crash when restoring from minimized window
sdottaka [Sun, 14 Nov 2010 13:42:44 +0000 (22:42 +0900)]
Fix crash when restoring from minimized window

13 years agoSupport surrogate pairs in filename
sdottaka [Sun, 14 Nov 2010 13:40:38 +0000 (22:40 +0900)]
Support surrogate pairs in filename