OSDN Git Service
sdottaka [Mon, 28 Jul 2014 16:51:30 +0000 (01:51 +0900)]
Bump revision to 2.14.0+-jp-49
--HG--
branch : stable
sdottaka [Mon, 28 Jul 2014 16:19:15 +0000 (01:19 +0900)]
Fix: NUL chars were lost when saving a file
--HG--
branch : stable
sdottaka [Sat, 26 Jul 2014 03:26:20 +0000 (12:26 +0900)]
Bump revision to 2.14.0+-jp-48
--HG--
branch : stable
sdottaka [Sat, 26 Jul 2014 03:02:47 +0000 (12:02 +0900)]
DirTravel.cpp: avoid accessing String out of bound
--HG--
branch : stable
sdottaka [Sat, 26 Jul 2014 02:47:30 +0000 (11:47 +0900)]
LoadSaveCodepageDlg.cpp: Add codepage 1200(UCS2-LE) in combobox
--HG--
branch : stable
sdottaka [Sat, 26 Jul 2014 02:45:37 +0000 (11:45 +0900)]
Make WinMerge zip-comparable without 7-zip.
The side effect of this change allows the following things:
- to compare subfolders in zip files (e.g. WinMerge-2.12.0-exe.zip\WinMerge-2.12.0-exe\MergePlugins)
- to compare FTP folders (e.g. ftp://username:password@servername/dir)
--HG--
branch : stable
sdottaka [Sat, 19 Jul 2014 13:11:32 +0000 (22:11 +0900)]
Bump revision to 2.14.0+-jp-47
--HG--
branch : stable
sdottaka [Sat, 19 Jul 2014 11:21:43 +0000 (20:21 +0900)]
Move decompressing code from MainFrm.cpp to 7zCommon.cpp
--HG--
branch : stable
sdottaka [Sat, 19 Jul 2014 08:20:28 +0000 (17:20 +0900)]
Add 3-way diff support to Hex View. close #34
--HG--
branch : stable
sdottaka [Sat, 19 Jul 2014 08:09:33 +0000 (17:09 +0900)]
EditorFilepathBar.cpp: Use member initialization list instead of assignment
--HG--
branch : stable
sdottaka [Sat, 19 Jul 2014 08:07:54 +0000 (17:07 +0900)]
Update Translations
--HG--
branch : stable
sdottaka [Sat, 19 Jul 2014 08:07:34 +0000 (17:07 +0900)]
Add "Enable Auto Max Width" menu item to Tab Bar context menu
--HG--
branch : stable
sdottaka [Sun, 13 Jul 2014 16:16:20 +0000 (01:16 +0900)]
Bump revision to 2.14.0+-jp-46
--HG--
branch : stable
sdottaka [Sun, 13 Jul 2014 15:47:09 +0000 (00:47 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 13 Jul 2014 15:45:59 +0000 (00:45 +0900)]
Add "Recompare As/XML" and "Recompare As/Binary" menu items to the "File" menu. close #33
--HG--
branch : stable
sdottaka [Sun, 29 Jun 2014 04:40:12 +0000 (13:40 +0900)]
Added tag 2.14.0+-jp-45 for changeset
b57fe1e3f902
--HG--
branch : stable
sdottaka [Sun, 29 Jun 2014 04:39:51 +0000 (13:39 +0900)]
Bump revison to 2.14.0+-jp-45
--HG--
branch : stable
sdottaka [Sun, 29 Jun 2014 04:39:33 +0000 (13:39 +0900)]
Update Japanese translation
--HG--
branch : stable
sdottaka [Sun, 29 Jun 2014 04:39:14 +0000 (13:39 +0900)]
MDITabBar.cpp:
- Fix compilation error with VC7.1
- Avoid floating non-active client window up when clicking it's MDITabBar close button
--HG--
branch : stable
sdottaka [Sun, 29 Jun 2014 04:35:01 +0000 (13:35 +0900)]
Fix blurred icon on MDITabBar (converted 24bit icon to 32bit icon)
--HG--
branch : stable
sdottaka [Sun, 29 Jun 2014 02:37:22 +0000 (11:37 +0900)]
Use diffcode::existAll()
--HG--
branch : stable
sdottaka [Sun, 22 Jun 2014 15:31:37 +0000 (00:31 +0900)]
Bump revison to 2.14.0+-jp-44
--HG--
branch : stable
sdottaka [Sun, 22 Jun 2014 15:31:11 +0000 (00:31 +0900)]
Fix: unexpected icon was shown at tabbar when comparing folders non-recursively
--HG--
branch : stable
sdottaka [Sun, 22 Jun 2014 14:41:52 +0000 (23:41 +0900)]
binarydiff.ico, equalbinary.ico: Add 24-bit color icon
--HG--
branch : stable
sdottaka [Sun, 22 Jun 2014 14:28:34 +0000 (23:28 +0900)]
CompareMSWordFiles plugin: Avoid getting unstable text on multi cores
--HG--
branch : stable
sdottaka [Sun, 22 Jun 2014 14:10:07 +0000 (23:10 +0900)]
MDITabBar: Show close button when hovering over tabs
--HG--
branch : stable
sdottaka [Wed, 28 May 2014 16:31:55 +0000 (01:31 +0900)]
Added tag 2.14.0+-jp-43 for changeset
ed1abf63791c
--HG--
branch : stable
sdottaka [Wed, 28 May 2014 16:31:39 +0000 (01:31 +0900)]
Bump revision to 2.14.0+-jp-43
--HG--
branch : stable
sdottaka [Wed, 28 May 2014 16:31:15 +0000 (01:31 +0900)]
Removed tag 2.14.0+-jp-43
--HG--
branch : stable
sdottaka [Wed, 28 May 2014 16:30:24 +0000 (01:30 +0900)]
Added tag 2.14.0+-jp-43 for changeset
abd84b5b93a3
--HG--
branch : stable
sdottaka [Wed, 28 May 2014 15:51:11 +0000 (00:51 +0900)]
New icons
--HG--
branch : stable
sdottaka [Sat, 24 May 2014 17:57:38 +0000 (02:57 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sat, 24 May 2014 17:57:17 +0000 (02:57 +0900)]
Enable syntax highlight in word diff text blocks.
--HG--
branch : stable
sdottaka [Thu, 22 May 2014 17:37:16 +0000 (02:37 +0900)]
Bump revision to 2.14.0+-jp-42
--HG--
branch : stable
sdottaka [Thu, 22 May 2014 17:37:01 +0000 (02:37 +0900)]
unicoder.cpp: Fix crash when comparing files that the size of the file is less than 3 bytes
--HG--
branch : stable
sdottaka [Sat, 17 May 2014 13:49:02 +0000 (22:49 +0900)]
Bump revision to 2.14.0+-jp-41
--HG--
branch : stable
sdottaka [Sat, 17 May 2014 13:43:44 +0000 (22:43 +0900)]
* crystaledit: An unexpected result occurred when replacing text in the case below:
Find what: (.*)
Replace with: X\1Z
Regular expression: checked
Text:
1
2
Expected result:
X1Z
X2Z
Actual result:
X1ZXZ
X2ZXZ
* crystaledit: infinite loop occurred when replacing text in the case below:
Find what: (.*)
Replace with: X\1Z\n
Regular expression: checked
Text:
1
2
--HG--
branch : stable
sdottaka [Sat, 10 May 2014 16:14:55 +0000 (01:14 +0900)]
Bump revision to 2.14.0+-jp-40
--HG--
branch : stable
sdottaka [Sat, 10 May 2014 16:14:09 +0000 (01:14 +0900)]
Update copyright year
--HG--
branch : stable
sdottaka [Sat, 10 May 2014 16:10:21 +0000 (01:10 +0900)]
Fix a bug introduced in rev.8345 (unpacker plugin reports file open error)
--HG--
branch : stable
sdottaka [Sat, 10 May 2014 13:35:16 +0000 (22:35 +0900)]
crystaledit: Fix wrong cursor position when clicking a line including TABs and wide chars
--HG--
branch : stable
sdottaka [Tue, 6 May 2014 04:25:45 +0000 (13:25 +0900)]
Remove compiler warnings
--HG--
branch : stable
sdottaka [Mon, 5 May 2014 16:09:04 +0000 (01:09 +0900)]
stringdiff3.cpp: remove an unused function
--HG--
branch : stable
sdottaka [Mon, 5 May 2014 15:45:53 +0000 (00:45 +0900)]
Cppcheck: C-style pointer casting
--HG--
branch : stable
sdottaka [Mon, 5 May 2014 15:40:14 +0000 (00:40 +0900)]
Cppcheck: Possible null pointer dereference: lpszString - otherwise it is redundant to check it against null.
--HG--
branch : stable
sdottaka [Mon, 5 May 2014 14:28:35 +0000 (23:28 +0900)]
* Remove MFC dependency from CustomColors.*
* Rename CustomColors.* to OptionsCustomColors.*
--HG--
branch : stable
sdottaka [Mon, 5 May 2014 13:28:20 +0000 (22:28 +0900)]
Cppcheck: Member variable '*::*' is not initialized in the constructor.
--HG--
branch : stable
sdottaka [Mon, 5 May 2014 13:21:27 +0000 (22:21 +0900)]
Cppcheck: %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.
--HG--
branch : stable
sdottaka [Sun, 4 May 2014 12:45:09 +0000 (21:45 +0900)]
Cppcheck: Variable '*' is reassigned a value before the old one has been used.
--HG--
branch : stable
sdottaka [Sun, 4 May 2014 12:38:21 +0000 (21:38 +0900)]
Cppcheck: Variable '*' is assigned in constructor body. Consider performing initialization in initialization list.
--HG--
branch : stable
sdottaka [Sun, 4 May 2014 12:14:53 +0000 (21:14 +0900)]
Remove MFC dependency from ClipBoard.*
--HG--
branch : stable
sdottaka [Sun, 4 May 2014 12:13:02 +0000 (21:13 +0900)]
Remove unused functions
--HG--
branch : stable
sdottaka [Fri, 2 May 2014 16:36:36 +0000 (01:36 +0900)]
Bump revison to 2.14.0+-jp-39
--HG--
branch : stable
sdottaka [Fri, 2 May 2014 16:36:12 +0000 (01:36 +0900)]
Remove unused variable and function (FileTextEncoding::m_guessed and DiffFileData::SetDefaultCodepage)
--HG--
branch : stable
sdottaka [Fri, 2 May 2014 16:34:09 +0000 (01:34 +0900)]
Fix a bug that DefaultSyntaxColors/Bold settings are not saved
--HG--
branch : stable
sdottaka [Tue, 29 Apr 2014 13:42:52 +0000 (22:42 +0900)]
Added tag 2.14.0+-jp-38 for changeset
7509ff36f229
--HG--
branch : stable
sdottaka [Tue, 29 Apr 2014 08:48:26 +0000 (17:48 +0900)]
DiffContext.cpp: Changes of compare options were ignored when recomparing folders
--HG--
branch : stable
sdottaka [Sun, 27 Apr 2014 12:11:11 +0000 (21:11 +0900)]
Bump revision to 2.14.0+-jp-38
--HG--
branch : stable
sdottaka [Sun, 27 Apr 2014 12:08:09 +0000 (21:08 +0900)]
Various optimizations for folder compare
--HG--
branch : stable
sdottaka [Sun, 27 Apr 2014 03:04:00 +0000 (12:04 +0900)]
Even if using Date/time compare method, WinMerge compared files using full content compare method if there are unique files
--HG--
branch : stable
sdottaka [Sun, 20 Apr 2014 04:54:04 +0000 (13:54 +0900)]
DiffFileData.*: remove unused class
--HG--
branch : stable
sdottaka [Sun, 6 Apr 2014 03:06:51 +0000 (12:06 +0900)]
DirTravel.cpp: could not enumerate files in Mac OS X Mavericks shared folders
--HG--
branch : stable
sdottaka [Sat, 29 Mar 2014 09:13:07 +0000 (18:13 +0900)]
Added tag 2.14.0+-jp-37 for changeset
7d739e2f17d0
--HG--
branch : stable
sdottaka [Sat, 29 Mar 2014 09:07:44 +0000 (18:07 +0900)]
JumpList.cpp: Fix ansi build
--HG--
branch : stable
sdottaka [Sat, 29 Mar 2014 06:22:35 +0000 (15:22 +0900)]
Bump revision to 2.14.0+-jp-37
--HG--
branch : stable
sdottaka [Sat, 29 Mar 2014 06:19:24 +0000 (15:19 +0900)]
Fix build error with VS2003
--HG--
branch : stable
sdottaka [Sat, 29 Mar 2014 05:54:19 +0000 (14:54 +0900)]
unicoder.cpp maketstring(): Show encoding error dialog instead of debug assertion dialog
--HG--
branch : stable
sdottaka [Sat, 29 Mar 2014 05:46:27 +0000 (14:46 +0900)]
MDITabBar.cpp: fine-tune the position of icons on tabbar
--HG--
branch : stable
sdottaka [Thu, 27 Mar 2014 16:59:28 +0000 (01:59 +0900)]
diffutils/src/util.c: Fix wrong type cast. This bug causes unexpected diff result when ignoring space changes
--HG--
branch : stable
sdottaka [Sun, 23 Mar 2014 00:30:13 +0000 (09:30 +0900)]
Bump revision to 2.14.0+-jp-36
--HG--
branch : stable
sdottaka [Sun, 23 Mar 2014 00:24:20 +0000 (09:24 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 23 Mar 2014 00:23:49 +0000 (09:23 +0900)]
Could not open recent files from File menu
--HG--
branch : stable
sdottaka [Sun, 23 Mar 2014 00:16:20 +0000 (09:16 +0900)]
Show compare method name at status bar
--HG--
branch : stable
sdottaka [Sun, 23 Mar 2014 00:13:08 +0000 (09:13 +0900)]
Fix mixed eol-style
--HG--
branch : stable
sdottaka [Sun, 23 Mar 2014 00:11:03 +0000 (09:11 +0900)]
FindTextDialog:
* Add "Don't close this dialog box" checkbox
* Add "Find Prev" button
--HG--
branch : stable
sdottaka [Sun, 16 Mar 2014 16:02:49 +0000 (01:02 +0900)]
Bump revision to 2.14.0+-jp-35
--HG--
branch : stable
sdottaka [Sun, 16 Mar 2014 15:59:53 +0000 (00:59 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 16 Mar 2014 15:59:18 +0000 (00:59 +0900)]
Display icons in the MDITabBar
--HG--
branch : stable
sdottaka [Sun, 16 Mar 2014 15:56:13 +0000 (00:56 +0900)]
Add "Recent Files Or Folders" menu item to [File] menu
--HG--
branch : stable
sdottaka [Sun, 16 Mar 2014 12:48:13 +0000 (21:48 +0900)]
Toolbar: Move "Folder Compare Method" list items to drop down menu
--HG--
branch : stable
sdottaka [Sun, 9 Mar 2014 02:29:51 +0000 (11:29 +0900)]
Bump revision to 2.14.0+-jp-34
--HG--
branch : stable
sdottaka [Sun, 9 Mar 2014 02:25:53 +0000 (11:25 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 9 Mar 2014 02:25:21 +0000 (11:25 +0900)]
Toolbar: Add drop down menu beside Options icon
Add "Folder Compare Method" combobox
--HG--
branch : stable
sdottaka [Sun, 9 Mar 2014 02:21:06 +0000 (11:21 +0900)]
HexView: diff text color became white if selected GitHub/Bitbucket color scheme
--HG--
branch : stable
sdottaka [Sun, 9 Mar 2014 01:16:54 +0000 (10:16 +0900)]
OpenView: Entered text at "Filter:" combobox was inserted not the top of the list but the bottom of the list
--HG--
branch : stable
sdottaka [Sat, 8 Mar 2014 07:40:18 +0000 (16:40 +0900)]
FolderCompare: Compare non-unique files prior to unique files
--HG--
branch : stable
sdottaka [Sat, 8 Mar 2014 07:00:09 +0000 (16:00 +0900)]
Apply also the patch "RFE: [
1646407 ] Use "equal" or "not equal" as file compare icon" for folder window icon
--HG--
branch : stable
sdottaka [Thu, 27 Feb 2014 14:29:19 +0000 (23:29 +0900)]
Added tag 2.14.0+-jp-33 for changeset
a60a94ccf09c
--HG--
branch : stable
sdottaka [Thu, 27 Feb 2014 14:29:00 +0000 (23:29 +0900)]
Bump revision to 2.14.0+-jp-33
--HG--
branch : stable
sdottaka [Thu, 27 Feb 2014 14:28:47 +0000 (23:28 +0900)]
BitBucket -> Bitbucket
--HG--
branch : stable
sdottaka [Sun, 23 Feb 2014 03:00:32 +0000 (12:00 +0900)]
Bump revision to 2.14.0+-jp-32
--HG--
branch : stable
sdottaka [Sun, 23 Feb 2014 02:42:39 +0000 (11:42 +0900)]
Remove some warnings
--HG--
branch : stable
sdottaka [Sun, 23 Feb 2014 00:18:39 +0000 (09:18 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 23 Feb 2014 00:17:56 +0000 (09:17 +0900)]
* Add checkboxes on Option Dialog for enabling syntax highlighting in difference blocks and so on
* Add "GitHub/BitBucket" button on Option Dialog for setting GitHub/BitBucket-like color scheme
--HG--
branch : stable
sdottaka [Sat, 22 Feb 2014 04:55:12 +0000 (13:55 +0900)]
Even if drag&droped without Ctrl pressed, do recursive compare if checked "Include subfolders" on OpenView
--HG--
branch : stable
sdottaka [Sat, 22 Feb 2014 04:40:09 +0000 (13:40 +0900)]
Fix mixed EOL-style
--HG--
branch : stable
sdottaka [Sun, 16 Feb 2014 01:10:09 +0000 (10:10 +0900)]
Added tag 2.14.0+-jp-31 for changeset
6bf09cc2c586
--HG--
branch : stable
sdottaka [Sun, 16 Feb 2014 01:09:48 +0000 (10:09 +0900)]
Bump revision to 2.14.0+-jp-31
--HG--
branch : stable
sdottaka [Sat, 15 Feb 2014 17:55:53 +0000 (02:55 +0900)]
OpenView: Improve the performance of opening OpenView
--HG--
branch : stable
sdottaka [Sat, 15 Feb 2014 15:46:21 +0000 (00:46 +0900)]
Update translations
--HG--
branch : stable
OSDN Git Service
