OSDN Git Service
sdottaka [Sun, 8 Mar 2015 12:51:42 +0000 (21:51 +0900)]
Merge with stable
sdottaka [Sun, 8 Mar 2015 11:58:10 +0000 (20:58 +0900)]
Bump revision to 2.14.0+-jp-75
--HG--
branch : stable
sdottaka [Sun, 8 Mar 2015 11:57:48 +0000 (20:57 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 8 Mar 2015 11:57:27 +0000 (20:57 +0900)]
- Add Externals/sevenzip
- Always use local 7-zip from WinMerge/Merge7z folder (Remove stand-alone 7-Zip support)
--HG--
branch : stable
sdottaka [Sat, 28 Feb 2015 15:19:20 +0000 (00:19 +0900)]
Merge with stable
sdottaka [Sat, 28 Feb 2015 14:34:41 +0000 (23:34 +0900)]
Merge with stable
sdottaka [Sat, 28 Feb 2015 13:09:14 +0000 (22:09 +0900)]
Added tag 2.14.0+-jp-74 for changeset
09ceb62ed959
--HG--
branch : stable
sdottaka [Fri, 27 Feb 2015 11:28:48 +0000 (20:28 +0900)]
Fix memory leak
--HG--
branch : stable
sdottaka [Fri, 27 Feb 2015 09:22:54 +0000 (18:22 +0900)]
WinMerge.sln: Add Poco folder
--HG--
branch : stable
sdottaka [Fri, 27 Feb 2015 09:22:27 +0000 (18:22 +0900)]
Merge.vcxproj: Remove Debug and Release Configuration
--HG--
branch : stable
sdottaka [Fri, 27 Feb 2015 09:00:01 +0000 (18:00 +0900)]
Stop to open Manual folder
--HG--
branch : stable
sdottaka [Fri, 27 Feb 2015 08:56:51 +0000 (17:56 +0900)]
Reduce the size of the executable file WinMergeU.exe
--HG--
branch : stable
sdottaka [Fri, 27 Feb 2015 08:32:19 +0000 (17:32 +0900)]
Bump revision to 2.14.0+-jp-74
--HG--
branch : stable
sdottaka [Fri, 27 Feb 2015 02:59:58 +0000 (11:59 +0900)]
Fix memory leak
--HG--
branch : stable
sdottaka [Fri, 27 Feb 2015 00:32:14 +0000 (09:32 +0900)]
Update frhed to changeset 43:
d3d3740d5a55
--HG--
branch : stable
sdottaka [Fri, 27 Feb 2015 00:31:53 +0000 (09:31 +0900)]
Exclude frhed.exe and WinIMerge.exe from installer and zip archive
--HG--
branch : stable
sdottaka [Wed, 25 Feb 2015 15:39:10 +0000 (00:39 +0900)]
Update frhed to changeset 41:
67fe39a6bd0f
--HG--
branch : stable
sdottaka [Wed, 25 Feb 2015 15:38:43 +0000 (00:38 +0900)]
Bump revision to 2.14.0+-jp-73
--HG--
branch : stable
sdottaka [Wed, 25 Feb 2015 15:38:17 +0000 (00:38 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Wed, 25 Feb 2015 15:33:49 +0000 (00:33 +0900)]
Add "Left/Middle/Right Shell menu" menu item in DirView context menu without any conditions
--HG--
branch : stable
sdottaka [Wed, 25 Feb 2015 07:02:23 +0000 (16:02 +0900)]
Update BuildArc.cmd
--HG--
branch : stable
sdottaka [Wed, 25 Feb 2015 07:01:52 +0000 (16:01 +0900)]
DropHandler.cpp: Fix missing file extension of dropped file
--HG--
branch : stable
sdottaka [Tue, 24 Feb 2015 14:58:57 +0000 (23:58 +0900)]
Merge with stable
sdottaka [Tue, 24 Feb 2015 14:20:02 +0000 (23:20 +0900)]
Bump revision to 2.14.0+-jp-72
--HG--
branch : stable
sdottaka [Tue, 24 Feb 2015 14:17:03 +0000 (23:17 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Tue, 24 Feb 2015 14:16:00 +0000 (23:16 +0900)]
Improve drag&drop support (from zip folder, ftp folder, thunderbird, winscp, firefox, chrome, ...)
--HG--
branch : stable
sdottaka [Sun, 22 Feb 2015 02:10:33 +0000 (11:10 +0900)]
Remove VC6 support
--HG--
branch : stable
sdottaka [Sun, 22 Feb 2015 02:02:09 +0000 (11:02 +0900)]
Remove redundant #pragma one
--HG--
branch : stable
sdottaka [Sat, 21 Feb 2015 14:51:24 +0000 (23:51 +0900)]
Merge with stable
sdottaka [Sat, 21 Feb 2015 14:28:09 +0000 (23:28 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sat, 21 Feb 2015 14:26:44 +0000 (23:26 +0900)]
- Add Language combo box to PropGeneral property sheet
- Remove LanguageSelect dialog and Language menu item
--HG--
branch : stable
sdottaka [Sat, 21 Feb 2015 03:39:59 +0000 (12:39 +0900)]
Remove ToolBarXPThemes.{cpp,h}
--HG--
branch : stable
sdottaka [Fri, 20 Feb 2015 15:38:44 +0000 (00:38 +0900)]
ConfigLog.cpp: Simplify to get OS version
--HG--
branch : stable
sdottaka [Fri, 20 Feb 2015 14:36:54 +0000 (23:36 +0900)]
SuperComboBox.cpp: Remove VC6.0 support
--HG--
branch : stable
sdottaka [Fri, 20 Feb 2015 10:32:10 +0000 (19:32 +0900)]
Merge with stable
sdottaka [Wed, 18 Feb 2015 12:22:21 +0000 (21:22 +0900)]
- Replace include guards with #pragma once like winmerge2011
- Remove $Id: lines
--HG--
branch : stable
sdottaka [Wed, 18 Feb 2015 08:37:32 +0000 (17:37 +0900)]
Move BCMenu.* to Common folder
Move ColorButton.* to Common folder
--HG--
branch : stable
sdottaka [Wed, 18 Feb 2015 07:23:51 +0000 (16:23 +0900)]
Rename CCPrompt.* to CCPromptDlg.*
Rename VssPrompt.* to VssPromptDlg.*
--HG--
branch : stable
sdottaka [Wed, 18 Feb 2015 07:00:20 +0000 (16:00 +0900)]
Merge with stable
sdottaka [Wed, 18 Feb 2015 05:16:40 +0000 (14:16 +0900)]
Add "Debug Unicode + Code Analysis" configuration
--HG--
branch : stable
sdottaka [Wed, 18 Feb 2015 04:24:59 +0000 (13:24 +0900)]
Plugins.cpp: C6226 Invalid HRESULT assignment to -1
--HG--
branch : stable
sdottaka [Wed, 18 Feb 2015 03:33:23 +0000 (12:33 +0900)]
SuperComboBox.cpp: C6386 Write Overrun
JumpList.cpp: C6386 Write Overrun
--HG--
branch : stable
sdottaka [Wed, 18 Feb 2015 01:32:43 +0000 (10:32 +0900)]
ccrystaltextview2.cpp: C6305 Mismatched size and count
VSSHelper.cpp: C6305 Mismatched size and count
--HG--
branch : stable
sdottaka [Tue, 17 Feb 2015 12:30:57 +0000 (21:30 +0900)]
Bump revision to 2.14.0+-jp-71
--HG--
branch : stable
sdottaka [Tue, 17 Feb 2015 12:20:25 +0000 (21:20 +0900)]
MergeDoc.cpp: Unpacker plugin did not work if 7-zip was not installed
--HG--
branch : stable
sdottaka [Tue, 17 Feb 2015 09:23:18 +0000 (18:23 +0900)]
ccrystaleditview.cpp: C6287 Redundant test Redundant code: the left and right sub-expressions are identical.
--HG--
branch : stable
sdottaka [Tue, 17 Feb 2015 07:40:36 +0000 (16:40 +0900)]
Cppcheck: Array 'codepagestotry[3]' accessed at index 3, which is out of bounds.
--HG--
branch : stable
sdottaka [Tue, 17 Feb 2015 07:27:32 +0000 (16:27 +0900)]
Cppcheck: Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?
--HG--
branch : stable
sdottaka [Tue, 17 Feb 2015 07:12:49 +0000 (16:12 +0900)]
Cppcheck: Opposite conditions in nested 'if' blocks lead to a dead code block.
--HG--
branch : stable
sdottaka [Tue, 17 Feb 2015 06:39:35 +0000 (15:39 +0900)]
Cppcheck: Variable 'm_oldPackingInfo' is assigned in constructor body. Consider performing initialization in initialization list.
--HG--
branch : stable
sdottaka [Tue, 17 Feb 2015 06:36:39 +0000 (15:36 +0900)]
Cppcheck: scanf without field width limits can crash with huge input data on some versions of libc.
--HG--
branch : stable
sdottaka [Tue, 17 Feb 2015 06:29:04 +0000 (15:29 +0900)]
Merge with stable
sdottaka [Tue, 17 Feb 2015 05:18:12 +0000 (14:18 +0900)]
Refactor for 3-way compare
--HG--
branch : stable
sdottaka [Tue, 17 Feb 2015 05:03:00 +0000 (14:03 +0900)]
Rename function names
--HG--
branch : stable
sdottaka [Tue, 17 Feb 2015 04:45:44 +0000 (13:45 +0900)]
Refactor for 3-way compare
--HG--
branch : stable
sdottaka [Tue, 17 Feb 2015 03:25:11 +0000 (12:25 +0900)]
FolderCompare: Make sub-folder recomparable
--HG--
branch : stable
sdottaka [Sun, 15 Feb 2015 10:14:27 +0000 (19:14 +0900)]
Merge with stable
sdottaka [Sun, 15 Feb 2015 09:43:09 +0000 (18:43 +0900)]
HexWindow: detecting file change did not work correctly.
--HG--
branch : stable
sdottaka [Sun, 15 Feb 2015 06:05:56 +0000 (15:05 +0900)]
Update frhed to changeset 39:
518ff8254983
--HG--
branch : stable
sdottaka [Fri, 13 Feb 2015 15:11:51 +0000 (00:11 +0900)]
Merge with stable
sdottaka [Fri, 13 Feb 2015 14:47:54 +0000 (23:47 +0900)]
Installer: Add forgotten file heksedit.lng
--HG--
branch : stable
sdottaka [Fri, 13 Feb 2015 13:34:39 +0000 (22:34 +0900)]
Forgot to add PropCompareBinary.{cpp,h}
--HG--
branch : stable
sdottaka [Fri, 13 Feb 2015 12:36:42 +0000 (21:36 +0900)]
Bump revision to 2.14.0+-jp-70
--HG--
branch : stable
sdottaka [Fri, 13 Feb 2015 12:20:03 +0000 (21:20 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Fri, 13 Feb 2015 12:19:41 +0000 (21:19 +0900)]
- Make Hex Editor configurable
- Compare binary files with Hex Editor when the file extensions are registered as binary
--HG--
branch : stable
sdottaka [Fri, 13 Feb 2015 12:09:11 +0000 (21:09 +0900)]
HexEditor: Fix graphical glitch at statusbar
--HG--
branch : stable
sdottaka [Wed, 11 Feb 2015 08:13:48 +0000 (17:13 +0900)]
Fix crash when opening hex view, if frhed is not installed
--HG--
branch : stable
sdottaka [Wed, 11 Feb 2015 08:00:45 +0000 (17:00 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Wed, 11 Feb 2015 07:56:22 +0000 (16:56 +0900)]
Remove unused resource strings
--HG--
branch : stable
sdottaka [Tue, 10 Feb 2015 14:24:48 +0000 (23:24 +0900)]
WinMerge*.iss: Add Frhed/Languages/ja.po
--HG--
branch : stable
sdottaka [Tue, 10 Feb 2015 14:23:14 +0000 (23:23 +0900)]
Poco: Attempt to avoid crash when accessing unstable filesystem or network share
--HG--
branch : stable
sdottaka [Mon, 9 Feb 2015 01:12:21 +0000 (10:12 +0900)]
Merge with stable
sdottaka [Mon, 9 Feb 2015 01:10:23 +0000 (10:10 +0900)]
Bump revision to 2.14.0+-jp-69
--HG--
branch : stable
sdottaka [Mon, 9 Feb 2015 01:09:43 +0000 (10:09 +0900)]
BuildArc.cmd: Fix the path of frhed
--HG--
branch : stable
sdottaka [Sun, 8 Feb 2015 16:17:04 +0000 (01:17 +0900)]
DirView.cpp: Could not copy files in DirView
sdottaka [Sun, 8 Feb 2015 16:16:06 +0000 (01:16 +0900)]
Merge.vcxproj: Add HexMergeView.h
--HG--
branch : stable
sdottaka [Sun, 8 Feb 2015 16:16:06 +0000 (01:16 +0900)]
Merge.vcxproj: Add HexMergeView.h
sdottaka [Sun, 8 Feb 2015 16:15:34 +0000 (01:15 +0900)]
MergeDoc.h: Remove unused function declaration
--HG--
branch : stable
sdottaka [Sun, 8 Feb 2015 16:15:34 +0000 (01:15 +0900)]
MergeDoc.h: Remove unused function declaration
sdottaka [Sun, 8 Feb 2015 16:13:41 +0000 (01:13 +0900)]
HexEditor: Add Undo & Redo feature
--HG--
branch : stable
sdottaka [Sun, 8 Feb 2015 16:13:41 +0000 (01:13 +0900)]
HexEditor: Add Undo & Redo feature
sdottaka [Wed, 28 Jan 2015 11:49:16 +0000 (20:49 +0900)]
Added tag 2.14.0+-jp-68 for changeset
0cb70ac3d833
--HG--
branch : stable
sdottaka [Sun, 25 Jan 2015 06:21:54 +0000 (15:21 +0900)]
Merge with stable
sdottaka [Sat, 24 Jan 2015 08:10:16 +0000 (17:10 +0900)]
Update revision to 2.14.0+-jp-68
--HG--
branch : stable
sdottaka [Sat, 24 Jan 2015 06:14:01 +0000 (15:14 +0900)]
rev. 8127 was incomplete.
--HG--
branch : stable
sdottaka [Thu, 22 Jan 2015 06:50:31 +0000 (15:50 +0900)]
Merge with stable
sdottaka [Thu, 22 Jan 2015 01:45:58 +0000 (10:45 +0900)]
Bump revision to 2.14.0+-jp-67
--HG--
branch : stable
sdottaka [Thu, 22 Jan 2015 01:45:18 +0000 (10:45 +0900)]
CompareMS*Files.sct: Make chkCompareWorksheetsAsImage checkbox checkable whether chkUnpackToFolder checkbox is checked
--HG--
branch : stable
sdottaka [Thu, 22 Jan 2015 01:00:09 +0000 (10:00 +0900)]
DirView.*: Inherit ReadOnly status from parent window when opening new folder window
--HG--
branch : stable
sdottaka [Thu, 22 Jan 2015 00:02:08 +0000 (09:02 +0900)]
CompareMS*Files.sct: Avoid detecting the script calling WScript.Shell#Run as a virus.
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 11:36:21 +0000 (20:36 +0900)]
Merge with stable
sdottaka [Fri, 16 Jan 2015 11:17:24 +0000 (20:17 +0900)]
Fix mixed-eol style
sdottaka [Fri, 16 Jan 2015 08:27:43 +0000 (17:27 +0900)]
Bump revision to 2.14.0+-jp-66
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 08:27:22 +0000 (17:27 +0900)]
OptionsDef.h: Rename Settings/CompMethod to Settings/CompMethod2
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 06:50:09 +0000 (15:50 +0900)]
TimeSizeCompare: Support 3-way compare
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 02:55:45 +0000 (11:55 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 02:47:15 +0000 (11:47 +0900)]
FolderCompare: Add Binary Contents compare method
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 02:45:51 +0000 (11:45 +0900)]
FolderCompare: Did not show items that have an error
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 02:38:28 +0000 (11:38 +0900)]
ImgMergeFrm.cpp: Fix mixed eol-style
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 02:37:46 +0000 (11:37 +0900)]
Update freeimage to changeset 4:
6e3572e0c245
--HG--
branch : stable
OSDN Git Service
