OSDN Git Service
Takashi Sawanaka [Sat, 6 Apr 2019 04:02:17 +0000 (13:02 +0900)]
Word-level merging did not work correctly if the number of lines in the diff block exceeded 20.
--HG--
branch : jp
Takashi Sawanaka [Fri, 5 Apr 2019 13:11:05 +0000 (22:11 +0900)]
Make FolderCompare project buildable again
--HG--
branch : jp
Takashi Sawanaka [Sun, 7 Apr 2019 15:03:12 +0000 (00:03 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Thu, 4 Apr 2019 12:45:27 +0000 (21:45 +0900)]
Added tag 2.16.2 for changeset
6d290fd0b893
--HG--
branch : stable
Takashi Sawanaka [Wed, 3 Apr 2019 22:41:48 +0000 (07:41 +0900)]
GhostTextView.cpp: Fix crash when selecting the Window->Split menu item
--HG--
branch : stable
Takashi Sawanaka [Wed, 3 Apr 2019 12:36:08 +0000 (21:36 +0900)]
Update release notes and changelog for 2.16.2 stable release
--HG--
branch : stable
Takashi Sawanaka [Mon, 1 Apr 2019 14:26:06 +0000 (23:26 +0900)]
Remove word level merge support due to unstable behavior
--HG--
branch : stable
Takashi Sawanaka [Sun, 31 Mar 2019 22:54:13 +0000 (07:54 +0900)]
MergeDoc.cpp: 'Copy All To Left/right' did not work correctly when the source pane includes ghost lines (2)
--HG--
branch : stable
Takashi Sawanaka [Sun, 31 Mar 2019 22:28:46 +0000 (07:28 +0900)]
Bitbucket issue #150: Menu item "File->File Encoding" moves main window
--HG--
branch : stable
datadiode [Sun, 31 Mar 2019 20:00:04 +0000 (22:00 +0200)]
https://sf.net/p/winmerge/feature-requests/1240/
--HG--
branch : stable
Takashi Sawanaka [Sun, 31 Mar 2019 12:08:46 +0000 (21:08 +0900)]
Change std::vector<T> output argument to return value
--HG--
branch : stable
Takashi Sawanaka [Sun, 31 Mar 2019 01:17:42 +0000 (10:17 +0900)]
Update translations
--HG--
branch : stable
Takashi Sawanaka [Sat, 30 Mar 2019 11:26:59 +0000 (20:26 +0900)]
MergeDoc.cpp: Fix mixed eol-style
--HG--
branch : stable
Takashi Sawanaka [Sat, 30 Mar 2019 07:03:51 +0000 (16:03 +0900)]
- Update winimerge to 1.0.8.0
- Update freeimage to 3.18.0
--HG--
branch : stable
Takashi Sawanaka [Sat, 30 Mar 2019 05:22:46 +0000 (14:22 +0900)]
bitbucket issue #148: Zoom In/Out menu items for image compare
--HG--
branch : stable
Tim Gerundt [Fri, 29 Mar 2019 22:03:42 +0000 (23:03 +0100)]
Manual: No plans for cross-platform support
--HG--
branch : stable
Tim Gerundt [Fri, 29 Mar 2019 21:47:48 +0000 (22:47 +0100)]
Add image to "Comparing binary files" page
--HG--
branch : stable
Tim Gerundt [Fri, 29 Mar 2019 21:47:25 +0000 (22:47 +0100)]
Add first content to "Comparing image files" page
--HG--
branch : stable
Takashi Sawanaka [Thu, 28 Mar 2019 22:25:01 +0000 (07:25 +0900)]
Added tag 2.16.0+-jp-13 for changeset
da4da0305ebb
--HG--
branch : jp
Takashi Sawanaka [Sun, 24 Mar 2019 12:38:17 +0000 (21:38 +0900)]
Bump revision to 2.16.0+-jp-13
--HG--
branch : jp
Takashi Sawanaka [Sun, 24 Mar 2019 11:59:09 +0000 (20:59 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Sun, 24 Mar 2019 07:31:59 +0000 (16:31 +0900)]
editlib/Sample: Add Ctrl+H shortcut key
--HG--
branch : stable
Takashi Sawanaka [Sun, 24 Mar 2019 07:31:26 +0000 (16:31 +0900)]
Merge.rc: tweak CEditReplaceDlg
--HG--
branch : stable
Takashi Sawanaka [Sun, 24 Mar 2019 07:29:49 +0000 (16:29 +0900)]
editlib: Make CEditReplaceDlg modeless dialog
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 12:33:22 +0000 (21:33 +0900)]
Fix sf.net ticket #2113: Edit > Replace > All, Undo: should undo all
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 12:14:30 +0000 (21:14 +0900)]
editlib: syntax highlighting not work in Sample project
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 11:38:51 +0000 (20:38 +0900)]
editlib: Use secure string functions
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 11:11:41 +0000 (20:11 +0900)]
editlib: crystaledit component should not depend on WinMerge sources.
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 07:25:52 +0000 (16:25 +0900)]
Cppcheck: Variable 'm_tvalue' is assigned in constructor body. Consider performing initialization in initialization list.
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 07:23:47 +0000 (16:23 +0900)]
Cppcheck: The function '...' overrides a function in a base class but is not marked with a 'override' specifier.
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 06:12:10 +0000 (15:12 +0900)]
Cppcheck: The scope of the variable '...' can be reduced
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 05:42:57 +0000 (14:42 +0900)]
Cppcheck: The condition 'pszChars[nPrevI]!='\\' || pszChars[nPrevI]=='\\' && *::CharPrev(pszChars,pszChars+nPrevI)=='\\'' is equivalent to 'pszChars[nPrevI]!='\\' || *::CharPrev(pszChars,pszChars+nPrevI)=='\\''.
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 03:56:01 +0000 (12:56 +0900)]
Update Japanese translation
--HG--
branch : stable
Takashi Sawanaka [Fri, 22 Mar 2019 23:23:22 +0000 (08:23 +0900)]
Fix bitbucket issue #147: Gibberish language during installation (Greek)
--HG--
branch : stable
Takashi Sawanaka [Thu, 21 Mar 2019 15:27:17 +0000 (00:27 +0900)]
ShellExtension: Add Build*.cmd
--HG--
branch : stable
Takashi Sawanaka [Thu, 21 Mar 2019 15:20:49 +0000 (00:20 +0900)]
ShellExtension: Bump revision to 1.17.6.0
--HG--
branch : stable
Takashi Sawanaka [Thu, 21 Mar 2019 12:47:38 +0000 (21:47 +0900)]
editlib: Add unit test project
--HG--
branch : stable
Tim Gerundt [Wed, 20 Mar 2019 20:34:51 +0000 (21:34 +0100)]
Manual: Fix "Dependency" from CompareMS*Files.sct plugins
--HG--
branch : stable
Tim Gerundt [Wed, 20 Mar 2019 20:27:50 +0000 (21:27 +0100)]
Manual: Fix some links
--HG--
branch : stable
Tichij [Mon, 18 Mar 2019 13:27:14 +0000 (15:27 +0200)]
Updated Lithuanian.po
--HG--
branch : stable
Takashi Sawanaka [Mon, 18 Mar 2019 13:39:49 +0000 (22:39 +0900)]
MergeStatusBar.cpp: Fix rare crash when maximizing MDI child window
--HG--
branch : stable
Takashi Sawanaka [Mon, 18 Mar 2019 13:12:03 +0000 (22:12 +0900)]
Merge7z: Add BuildArc.cmd
--HG--
branch : stable
Takashi Sawanaka [Mon, 18 Mar 2019 12:29:04 +0000 (21:29 +0900)]
Merge7z: Remvoe version number from DLL file name (2)
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Mar 2019 23:18:44 +0000 (08:18 +0900)]
Upgrade to 7-Zip 19.00 (2)
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Mar 2019 23:16:44 +0000 (08:16 +0900)]
Merge7z: Add BuidBin.*.cmd
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Mar 2019 23:15:03 +0000 (08:15 +0900)]
editlib: Add Lua syntax highlighting (3)
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Mar 2019 23:09:36 +0000 (08:09 +0900)]
Upgrade to 7-Zip 19.00
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Mar 2019 23:08:51 +0000 (08:08 +0900)]
Merge7z: Remvoe version number from DLL file name
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Mar 2019 14:03:23 +0000 (23:03 +0900)]
Bump revision to 2.16.0+-jp-12
--HG--
branch : jp
Takashi Sawanaka [Sun, 17 Mar 2019 14:01:10 +0000 (23:01 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Thu, 14 Mar 2019 11:10:30 +0000 (20:10 +0900)]
Bump revsion to 2.16.0+-jp-11
--HG--
branch : jp
Takashi Sawanaka [Thu, 14 Mar 2019 11:08:47 +0000 (20:08 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Thu, 14 Mar 2019 07:46:28 +0000 (16:46 +0900)]
Fix sf.net ticket #2163: Save As: default directory should be file's original directory
--HG--
branch : stable
Vladmiro Galante [Thu, 14 Mar 2019 06:59:34 +0000 (06:59 +0000)]
Italian.po edited online with Bitbucket
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Mar 2019 13:28:43 +0000 (22:28 +0900)]
editlib: Add Lua syntax highlighting
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Mar 2019 03:32:59 +0000 (12:32 +0900)]
FolderCompare: Display folder size
* * *
editlib: Remove CCrystalTextView dependency from line parsers
* * *
editlib: Remove CCrystalTextView dependency from line parsers (2)
--HG--
branch : stable
Takashi Sawanaka [Sat, 16 Mar 2019 07:15:16 +0000 (16:15 +0900)]
MDITabBar.cpp: Improve icon display at 120DPI
--HG--
branch : stable
Takashi Sawanaka [Sat, 16 Mar 2019 04:20:59 +0000 (13:20 +0900)]
When updating English.pot file, if there is no change other than POT-Creation-Date, restore English.pot file.
--HG--
branch : stable
Takashi Sawanaka [Sat, 16 Mar 2019 04:14:40 +0000 (13:14 +0900)]
Remove BuildMergelangDll.bat
--HG--
branch : stable
Takashi Sawanaka [Sat, 16 Mar 2019 00:23:03 +0000 (09:23 +0900)]
OptionsInit.cpp: sf.net Patch #2954 Set default language to System Language ID
--HG--
branch : stable
Takashi Sawanaka [Thu, 14 Mar 2019 04:53:37 +0000 (13:53 +0900)]
word level diff dit not work if the text contains NUL characters
--HG--
branch : stable
Takashi Sawanaka [Thu, 14 Mar 2019 01:22:41 +0000 (10:22 +0900)]
Add Testing/Data/LastLineEOL/2-3CRLF.txt
--HG--
branch : stable
Takashi Sawanaka [Wed, 13 Mar 2019 23:52:36 +0000 (08:52 +0900)]
Fix crash when failed to load file
--HG--
branch : stable
Takashi Sawanaka [Tue, 12 Mar 2019 22:30:48 +0000 (07:30 +0900)]
Add Domènec to Contributers.txt
--HG--
branch : stable
Domènec [Tue, 12 Mar 2019 17:19:29 +0000 (17:19 +0000)]
Catalan.po edited online with Bitbucket
--HG--
branch : stable
Takashi Sawanaka [Tue, 12 Mar 2019 14:44:07 +0000 (23:44 +0900)]
Fix sf.net ticket #2217 Compare results refresh incorrectly after deletions
--HG--
branch : stable
Takashi Sawanaka [Tue, 12 Mar 2019 14:22:24 +0000 (23:22 +0900)]
DiffItem.cpp: Fix infinite loop when deleting the first item and rescanning
--HG--
branch : stable
Takashi Sawanaka [Tue, 12 Mar 2019 13:14:44 +0000 (22:14 +0900)]
DiffItem.cpp: DIFFITEM destructor should not remove its siblings
--HG--
branch : stable
Tim Gerundt [Mon, 11 Mar 2019 05:01:31 +0000 (06:01 +0100)]
Manual: Small tweaks for "Install" page (Compatibility and Shell Integration)
--HG--
branch : stable
Takashi Sawanaka [Sun, 10 Mar 2019 13:13:14 +0000 (22:13 +0900)]
Bump revision to 2.16.0+-jp-10
--HG--
branch : jp
Takashi Sawanaka [Sun, 10 Mar 2019 13:11:39 +0000 (22:11 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Sun, 10 Mar 2019 13:11:27 +0000 (22:11 +0900)]
UploadToBitbucket.cmd
--HG--
branch : jp
Takashi Sawanaka [Sun, 10 Mar 2019 13:06:34 +0000 (22:06 +0900)]
DirItem.cpp: Reuse TFile instance
--HG--
branch : stable
Takashi Sawanaka [Sun, 10 Mar 2019 04:05:41 +0000 (13:05 +0900)]
Delete bForceUTF8 argument that no longer makes sense
(At present, the content of the text buffer is always output to the file with UCS2-LE)
--HG--
branch : stable
Takashi Sawanaka [Sun, 10 Mar 2019 03:29:45 +0000 (12:29 +0900)]
MergeDoc.cpp: 'Copy All To Left/right' did not work correctly when the source pane includes ghost lines
--HG--
branch : stable
Takashi Sawanaka [Sun, 10 Mar 2019 01:54:30 +0000 (10:54 +0900)]
Remove IF_IS_TRUE_ALL macro
--HG--
branch : stable
Takashi Sawanaka [Sat, 9 Mar 2019 17:00:01 +0000 (02:00 +0900)]
Reduce compilation time (2)
--HG--
branch : stable
Takashi Sawanaka [Sat, 9 Mar 2019 13:51:15 +0000 (22:51 +0900)]
Reduce compilation time
--HG--
branch : stable
Tim Gerundt [Fri, 8 Mar 2019 23:04:57 +0000 (00:04 +0100)]
Manual: Don't use admonitions images
--HG--
branch : stable
Tim Gerundt [Fri, 8 Mar 2019 21:55:12 +0000 (22:55 +0100)]
Manual: Use fonts and navigation like in the new website
--HG--
branch : stable
Takashi Sawanaka [Tue, 26 Mar 2019 22:14:22 +0000 (07:14 +0900)]
Update Contributors.txt
--HG--
branch : stable
MaysWind [Tue, 26 Mar 2019 17:49:14 +0000 (01:49 +0800)]
update Simplified Chinese translation
--HG--
branch : stable
Takashi Sawanaka [Sat, 2 Mar 2019 23:12:02 +0000 (08:12 +0900)]
Merge.cpp: Use ATTACH_PARENT_PROCESS instead of -1
--HG--
branch : stable
Takashi Sawanaka [Sat, 2 Mar 2019 15:54:10 +0000 (00:54 +0900)]
Merge.cpp: Output the message of message box to parent console if '/noninteractive ' command line option is specified,
--HG--
branch : stable
Takashi Sawanaka [Thu, 28 Feb 2019 21:25:10 +0000 (06:25 +0900)]
Added tag 2.16.0+-jp-9 for changeset
542aca55dee3
--HG--
branch : jp
Takashi Sawanaka [Sun, 24 Feb 2019 14:31:32 +0000 (23:31 +0900)]
Bump revision to 2.16.0+-jp-9
--HG--
branch : jp
Takashi Sawanaka [Sun, 24 Feb 2019 14:29:10 +0000 (23:29 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Sun, 24 Feb 2019 14:09:54 +0000 (23:09 +0900)]
Update release notes and changelog for 2.16.1
--HG--
branch : stable
Takashi Sawanaka [Sun, 24 Feb 2019 10:49:03 +0000 (19:49 +0900)]
Reduce unnecessary drawing
--HG--
branch : stable
Takashi Sawanaka [Sun, 24 Feb 2019 07:41:35 +0000 (16:41 +0900)]
Use COptionsMgr instead of GetProfile*() and WriteProfile*()
--HG--
branch : stable
Takashi Sawanaka [Sun, 24 Feb 2019 07:15:17 +0000 (16:15 +0900)]
Update Contributors.txt
--HG--
branch : stable
Yanko Yankov [Wed, 20 Feb 2019 22:28:56 +0000 (22:28 +0000)]
Bulgarian.po edited online with Bitbucket
--HG--
branch : stable
Takashi Sawanaka [Mon, 18 Feb 2019 22:42:53 +0000 (07:42 +0900)]
Fix sf.net ticket #2215: Cancelation of selection range with reverse indent
(Revert the commit "Improve handling of last lines in files (4) (
b3d10de90b11)" partially)
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Feb 2019 12:05:26 +0000 (21:05 +0900)]
Bump revision to 2.16.0+-jp-8
--HG--
branch : jp
Takashi Sawanaka [Sun, 17 Feb 2019 12:03:44 +0000 (21:03 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Sun, 17 Feb 2019 11:57:06 +0000 (20:57 +0900)]
'Automatically scroll to first difference' option did not work since
0db5699a19e7
--HG--
branch : stable
Takashi Sawanaka [Tue, 29 Jan 2019 15:06:49 +0000 (00:06 +0900)]
Added tag 2.16.0+-jp-7 for changeset
3b9d8019a04f
--HG--
branch : jp
Takashi Sawanaka [Sun, 27 Jan 2019 23:12:58 +0000 (08:12 +0900)]
Bump revision to 2.16.0+-jp-7
--HG--
branch : jp
Takashi Sawanaka [Sun, 27 Jan 2019 23:11:48 +0000 (08:11 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Sun, 27 Jan 2019 23:11:33 +0000 (08:11 +0900)]
ManualJapanese/Filters.xml: Fix sf.net issue #2211: end of line documentation
--HG--
branch : jp