OSDN Git Service

winmerge-jp/winmerge-jp.git
12 years agoMerge from https://github.com/tacahiroy/WinMerge-Docs-ja/
sdottaka [Sun, 5 Feb 2012 04:00:03 +0000 (13:00 +0900)]
Merge from https://github.com/tacahiroy/WinMerge-Docs-ja/

12 years agoAdded tag 2.13.20+-jp-9 for changeset 3fe9539c763c
sdottaka [Wed, 28 Dec 2011 14:24:17 +0000 (23:24 +0900)]
Added tag 2.13.20+-jp-9 for changeset 3fe9539c763c

12 years agoFix crash when saving files after following steps: 2.13.20+-jp-9
sdottaka [Wed, 28 Dec 2011 14:23:11 +0000 (23:23 +0900)]
Fix crash when saving files after following steps:
1. Compare folders.
2. Compare files from folder view.
3. Click the tab of the folder view and select [hide items] menu item of the opened files.
4. Save the opened files -> crash!

12 years agoDisplay log messages(devenv) on build
sdottaka [Wed, 28 Dec 2011 14:03:56 +0000 (23:03 +0900)]
Display log messages(devenv) on build

12 years agoMove editlib folder to external\crystaledit
sdottaka [Fri, 23 Dec 2011 10:32:36 +0000 (19:32 +0900)]
Move editlib folder to external\crystaledit

12 years agoFix mixed EOL
sdottaka [Mon, 19 Dec 2011 12:45:06 +0000 (21:45 +0900)]
Fix mixed EOL

12 years agoMake CrystalEdit buildable without CCrystalEditView class
sdottaka [Sun, 18 Dec 2011 12:29:06 +0000 (21:29 +0900)]
Make CrystalEdit buildable without CCrystalEditView class

12 years agoMake EditorTest buildable with VC6
sdottaka [Sun, 18 Dec 2011 11:17:09 +0000 (20:17 +0900)]
Make EditorTest buildable with VC6

12 years agoMake EditorTest buildable with VC6
sdottaka [Sun, 18 Dec 2011 10:01:15 +0000 (19:01 +0900)]
Make EditorTest buildable with VC6

12 years agoChange registry location for Find & Replace strings
sdottaka [Sat, 17 Dec 2011 13:20:24 +0000 (22:20 +0900)]
Change registry location for Find & Replace strings

12 years agoReplace BOOL with bool
sdottaka [Sat, 17 Dec 2011 12:43:56 +0000 (21:43 +0900)]
Replace BOOL with bool

12 years agoReplace BOOL with bool
sdottaka [Sat, 17 Dec 2011 06:04:01 +0000 (15:04 +0900)]
Replace BOOL with bool

12 years agoRemove UnicodeString.h and other winmerge related dependency from crystaledit
sdottaka [Mon, 12 Dec 2011 14:30:57 +0000 (23:30 +0900)]
Remove UnicodeString.h and other winmerge related dependency from crystaledit

12 years agoRemove CSuperComboBox dependency from crystaledit
sdottaka [Mon, 12 Dec 2011 14:25:39 +0000 (23:25 +0900)]
Remove CSuperComboBox dependency from crystaledit

12 years agoFix broken message after replaced text
sdottaka [Mon, 12 Dec 2011 12:20:45 +0000 (21:20 +0900)]
Fix broken message after replaced text

12 years agoRemove coretypes.h dependency from crystaledit.
sdottaka [Sun, 11 Dec 2011 15:18:32 +0000 (00:18 +0900)]
Remove coretypes.h dependency from crystaledit.

12 years agoRemove some stuff from EditorTest/StdAfx.*
sdottaka [Sun, 11 Dec 2011 04:02:54 +0000 (13:02 +0900)]
Remove some stuff from EditorTest/StdAfx.*

12 years agostring_util.*, SyntaxColors.*, ViewableWhitespace.* are used in only crystaledit.
sdottaka [Sat, 10 Dec 2011 12:38:10 +0000 (21:38 +0900)]
string_util.*, SyntaxColors.*, ViewableWhitespace.* are used in only crystaledit.
So move these files to editlib folder.

12 years ago- Remove COptionsMgr dependency from CrystalEdit component
sdottaka [Sat, 10 Dec 2011 08:43:24 +0000 (17:43 +0900)]
- Remove COptionsMgr dependency from CrystalEdit component
- Remove pcre dependency from CrystalEdit component

12 years agoRemove COptionsMgr dependency from CrystalEdit component
sdottaka [Sat, 10 Dec 2011 08:42:32 +0000 (17:42 +0900)]
Remove COptionsMgr dependency from CrystalEdit component

12 years agoUpdate revisions
sdottaka [Sat, 10 Dec 2011 08:33:57 +0000 (17:33 +0900)]
Update revisions

12 years ago- Remove isx.{cpp, h}
sdottaka [Sat, 10 Dec 2011 08:32:49 +0000 (17:32 +0900)]
- Remove isx.{cpp, h}
- Move IsXKeyword() function to string_util.{cpp, h}

12 years agoUse MSBuild instead of devenv to build WinMerge
sdottaka [Tue, 6 Dec 2011 13:07:18 +0000 (22:07 +0900)]
Use MSBuild instead of devenv to build WinMerge

12 years agoLink pcre and expat library statically
sdottaka [Tue, 6 Dec 2011 13:05:00 +0000 (22:05 +0900)]
Link pcre and expat library statically

12 years agoBUG: [2529521] Replace no longer substitutes backrefs & non-printable chars
sdottaka [Tue, 29 Nov 2011 13:37:33 +0000 (22:37 +0900)]
BUG: [2529521] Replace no longer substitutes backrefs & non-printable chars

12 years agoAdded tag 2.13.20+-jp-8 for changeset fb7c015bae2b
sdottaka [Sat, 26 Nov 2011 13:55:10 +0000 (22:55 +0900)]
Added tag 2.13.20+-jp-8 for changeset fb7c015bae2b

12 years agoRemoved tag 2.13.20+-jp-8 2.13.20+-jp-8
sdottaka [Sat, 26 Nov 2011 13:54:30 +0000 (22:54 +0900)]
Removed tag 2.13.20+-jp-8

12 years agoForgot to commit this file.
sdottaka [Sat, 26 Nov 2011 13:53:30 +0000 (22:53 +0900)]
Forgot to commit this file.

12 years agoAdded tag 2.13.20+-jp-8 for changeset a53c969e9fea
sdottaka [Thu, 24 Nov 2011 14:54:01 +0000 (23:54 +0900)]
Added tag 2.13.20+-jp-8 for changeset a53c969e9fea

12 years agoUpdate revisions
sdottaka [Wed, 23 Nov 2011 14:45:43 +0000 (23:45 +0900)]
Update revisions

12 years agoPrevent OpenFileName() from changing current directory.
sdottaka [Sat, 19 Nov 2011 04:38:37 +0000 (13:38 +0900)]
Prevent OpenFileName() from changing current directory.
This fix enables to accept relative paths(e.g. editor path) in Option dialog.

12 years agoFix build failure of EditorTest
sdottaka [Sun, 13 Nov 2011 13:47:41 +0000 (22:47 +0900)]
Fix build failure of EditorTest

12 years agoremove unnecessary files
sdottaka [Sun, 13 Nov 2011 13:46:12 +0000 (22:46 +0900)]
remove unnecessary files

12 years agoAdded tag 2.13.20+-jp-7 for changeset 845fdf23292a
sdottaka [Mon, 10 Oct 2011 17:13:40 +0000 (02:13 +0900)]
Added tag 2.13.20+-jp-7 for changeset 845fdf23292a

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