OSDN Git Service
sdottaka [Mon, 26 Oct 2015 16:35:16 +0000 (01:35 +0900)]
Bump revision to 2.14.0+-jp-88
sdottaka [Mon, 26 Oct 2015 16:34:57 +0000 (01:34 +0900)]
ShellExtension.cpp: Remove the code for old Windows versions
sdottaka [Mon, 26 Oct 2015 16:24:56 +0000 (01:24 +0900)]
ShellExtension.vcxproj: Remove unused source file
sdottaka [Mon, 26 Oct 2015 15:28:52 +0000 (00:28 +0900)]
The font size of the file compare window was not changed when Windows DPI setting was changed
sdottaka [Sun, 18 Oct 2015 14:02:11 +0000 (23:02 +0900)]
Bump revision to 2.14.0+-jp-87
sdottaka [Sun, 18 Oct 2015 13:55:59 +0000 (22:55 +0900)]
FilepathEdit.cpp: Fix that text on the header bar disappears when mouse pointer hovers on it
sdottaka [Sun, 18 Oct 2015 13:42:35 +0000 (22:42 +0900)]
Merge.vcxproj.filters: Move BCMenu.cpp and etc to MFCGui/Common folder
sdottaka [Sat, 10 Oct 2015 15:29:13 +0000 (00:29 +0900)]
Replace UINT with unsigned
sdottaka [Mon, 28 Sep 2015 15:16:24 +0000 (00:16 +0900)]
Added tag 2.14.0+-jp-86 for changeset
f116be911162
sdottaka [Mon, 21 Sep 2015 10:36:30 +0000 (19:36 +0900)]
Bump revision to 2.14.0+-jp-86
sdottaka [Mon, 21 Sep 2015 10:28:45 +0000 (19:28 +0900)]
Add boost/range/mfc.hpp
sdottaka [Mon, 21 Sep 2015 08:21:49 +0000 (17:21 +0900)]
Update translations
sdottaka [Mon, 21 Sep 2015 07:04:47 +0000 (16:04 +0900)]
Add Include Subfolders menu item to IDR_POPUP_DIFF_OPTIONS popup menu
sdottaka [Sun, 20 Sep 2015 13:38:20 +0000 (22:38 +0900)]
DirItemIterator.h: Fix crash when entering empty folders
sdottaka [Sun, 20 Sep 2015 09:46:05 +0000 (18:46 +0900)]
Environment.cpp: Synchronize with stable branch
sdottaka [Sun, 20 Sep 2015 07:49:40 +0000 (16:49 +0900)]
DireItemIterator.h: Use nullptr instead of NULL
sdottaka [Sun, 20 Sep 2015 07:44:38 +0000 (16:44 +0900)]
Fix DirActions::IsItemFile() function to work properly
sdottaka [Sun, 20 Sep 2015 03:55:21 +0000 (12:55 +0900)]
Use std::stoi() instead of string_stoi()
sdottaka [Sun, 20 Sep 2015 03:54:03 +0000 (12:54 +0900)]
unicoder.cpp: Remove needless code
sdottaka [Sun, 20 Sep 2015 03:49:38 +0000 (12:49 +0900)]
LanguageSelect.h: Remove unused #include
sdottaka [Sat, 19 Sep 2015 14:04:38 +0000 (23:04 +0900)]
Remove CSubClass.cpp from Merge.vcxproj.filters
sdottaka [Sat, 19 Sep 2015 13:27:42 +0000 (22:27 +0900)]
Include vcomp120.dll in installer and archive files for WinIMergeLib.dll
sdottaka [Sat, 19 Sep 2015 13:20:54 +0000 (22:20 +0900)]
Do not include SignShellExtension.bat in archive files
sdottaka [Sat, 19 Sep 2015 12:13:04 +0000 (21:13 +0900)]
Remove unused files
sdottaka [Sun, 13 Sep 2015 11:10:06 +0000 (20:10 +0900)]
BuildArc.cmd: Add /y option to xcopy command to avoid confirmation
sdottaka [Sun, 13 Sep 2015 10:40:13 +0000 (19:40 +0900)]
Bump revision to 2.14.0+-jp-85
sdottaka [Sun, 13 Sep 2015 10:26:21 +0000 (19:26 +0900)]
MainFrm.cpp: Avoid losing recurse setting when compared items do not exist
sdottaka [Sun, 13 Sep 2015 07:50:58 +0000 (16:50 +0900)]
Update freeimage to changeset 6:
38ec4c483ab8
Update winimerge to changeset 89:
640f3dc99812
sdottaka [Sat, 12 Sep 2015 04:27:10 +0000 (13:27 +0900)]
Update boost to 1.59.0
sdottaka [Sun, 6 Sep 2015 15:22:19 +0000 (00:22 +0900)]
Merge with stable
sdottaka [Sun, 6 Sep 2015 15:15:03 +0000 (00:15 +0900)]
Update translations
sdottaka [Sun, 6 Sep 2015 15:14:39 +0000 (00:14 +0900)]
Resume implementing 3-way folder compare
sdottaka [Sat, 29 Aug 2015 04:45:25 +0000 (13:45 +0900)]
Added tag 2.14.0+-jp-84 for changeset
569d1f95bbf0
--HG--
branch : stable
sdottaka [Sun, 9 Aug 2015 01:49:01 +0000 (10:49 +0900)]
Fix the problem that MDI TabBar icon does not change when completing compare
sdottaka [Sun, 9 Aug 2015 01:20:20 +0000 (10:20 +0900)]
Use std::bind instead of boost::bind
sdottaka [Sat, 8 Aug 2015 12:12:37 +0000 (21:12 +0900)]
ImgMergeFrm.cpp: Change the registry path of Location Pane settings on Image Diff Window
--HG--
branch : stable
sdottaka [Sun, 2 Aug 2015 09:10:51 +0000 (18:10 +0900)]
Merge with stable
sdottaka [Sun, 2 Aug 2015 02:35:24 +0000 (11:35 +0900)]
Bump revision to 2.14.0+-jp-84
--HG--
branch : stable
sdottaka [Sun, 2 Aug 2015 02:34:20 +0000 (11:34 +0900)]
Add Location Pane on Image Merge Window
--HG--
branch : stable
sdottaka [Sat, 25 Jul 2015 02:08:51 +0000 (11:08 +0900)]
Fix compilation errors with VS2015
--HG--
branch : stable
sdottaka [Sun, 19 Jul 2015 13:17:44 +0000 (22:17 +0900)]
Merge with stable
sdottaka [Sun, 19 Jul 2015 12:57:29 +0000 (21:57 +0900)]
Merge with stable
sdottaka [Sun, 19 Jul 2015 12:39:00 +0000 (21:39 +0900)]
Remove MergeApp.h dependency from some source files
--HG--
branch : stable
sdottaka [Sat, 18 Jul 2015 07:17:34 +0000 (16:17 +0900)]
FileActtionScript.cpp: Remove #include "MainFrm.h"
--HG--
branch : stable
sdottaka [Sat, 18 Jul 2015 02:17:37 +0000 (11:17 +0900)]
Cppcheck: The scope of the variable '...' can be reduced.
--HG--
branch : stable
sdottaka [Fri, 17 Jul 2015 15:16:15 +0000 (00:16 +0900)]
Cppcheck: Class '...' has a constructor with 1 argument that is not explicit.
--HG--
branch : stable
sdottaka [Sun, 12 Jul 2015 10:19:27 +0000 (19:19 +0900)]
Merge with stable
sdottaka [Sat, 11 Jul 2015 09:10:04 +0000 (18:10 +0900)]
Remove WinMergeU.exe.manifest
--HG--
branch : stable
sdottaka [Sat, 11 Jul 2015 04:19:42 +0000 (13:19 +0900)]
Use Mecurial EOL Extension
--HG--
branch : stable
sdottaka [Sat, 11 Jul 2015 02:54:52 +0000 (11:54 +0900)]
ArchiveSupport/Merge7z/readme.txt: Fix mixed eol-style
--HG--
branch : stable
sdottaka [Sat, 4 Jul 2015 14:35:07 +0000 (23:35 +0900)]
Fix wrong help file path
--HG--
branch : stable
sdottaka [Sat, 4 Jul 2015 13:57:34 +0000 (22:57 +0900)]
DirScan.cpp: Fix warnings
--HG--
branch : stable
sdottaka [Sun, 21 Jun 2015 15:50:01 +0000 (00:50 +0900)]
Merge with stable
sdottaka [Sun, 21 Jun 2015 15:49:28 +0000 (00:49 +0900)]
BuildArc.cmd: Include GnuWin32 patch for Windows in archive file
--HG--
branch : stable
sdottaka [Sun, 21 Jun 2015 15:20:12 +0000 (00:20 +0900)]
Merge with stable
sdottaka [Sun, 21 Jun 2015 14:36:08 +0000 (23:36 +0900)]
Bump revision to 2.14.0+-jp-83
--HG--
branch : stable
sdottaka [Sun, 21 Jun 2015 14:35:42 +0000 (23:35 +0900)]
Plugins: Add ApplyPatch.sct
--HG--
branch : stable
sdottaka [Sun, 21 Jun 2015 11:10:56 +0000 (20:10 +0900)]
Make each plugins disableable
--HG--
branch : stable
sdottaka [Sun, 21 Jun 2015 01:01:53 +0000 (10:01 +0900)]
OptionsInit.cpp: Set the initial value of OPT_BREAK_TYPE to 1(Break at whitespace or punctuation)
--HG--
branch : stable
sdottaka [Sun, 21 Jun 2015 00:21:29 +0000 (09:21 +0900)]
CompareMSExcelFiles.sct: Fix wrong for-loop range in writeFormulas() function
--HG--
branch : stable
sdottaka [Sun, 21 Jun 2015 00:13:46 +0000 (09:13 +0900)]
CompareMSExcelFiles.sct: Include shapes, which are outside of UsedRange, in worksheet image
--HG--
branch : stable
sdottaka [Sat, 20 Jun 2015 07:46:38 +0000 (16:46 +0900)]
crystaledit: fix flickering when replacing text
--HG--
branch : stable
sdottaka [Sat, 20 Jun 2015 03:25:58 +0000 (12:25 +0900)]
Make an archive file comparable to a normal file
--HG--
branch : stable
sdottaka [Sat, 20 Jun 2015 02:47:00 +0000 (11:47 +0900)]
HexMergeDoc.cpp: Fix crash when refocusing new empty files
--HG--
branch : stable
sdottaka [Sat, 20 Jun 2015 02:29:39 +0000 (11:29 +0900)]
Externals: Update winimerge to 79:
11992dbd7e2c
--HG--
branch : stable
sdottaka [Sun, 14 Jun 2015 13:10:47 +0000 (22:10 +0900)]
Merge.cpp: Use Meiryo UI font instead of Meiryo font
--HG--
branch : stable
sdottaka [Sun, 14 Jun 2015 13:08:17 +0000 (22:08 +0900)]
Installer: Install GnuWin32 Patch for Windows
--HG--
branch : stable
sdottaka [Sun, 7 Jun 2015 11:21:51 +0000 (20:21 +0900)]
Bump revsion to 2.14.0+-jp-82
--HG--
branch : stable
sdottaka [Sat, 6 Jun 2015 10:19:46 +0000 (19:19 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sat, 6 Jun 2015 10:06:12 +0000 (19:06 +0900)]
PropShell: Remove "Include subfolders by default" checkbox
--HG--
branch : stable
sdottaka [Sat, 6 Jun 2015 10:04:17 +0000 (19:04 +0900)]
ShellExtension: Bump revision to 1.16.5.4
--HG--
branch : stable
sdottaka [Sat, 6 Jun 2015 10:03:51 +0000 (19:03 +0900)]
ShellExtension: Use HKCU\Software\Thingamahoochie\WinMerge\Settings\Recurse instead of HKCU\Software\Thingamahoochie\WinMerge\ContextMenuEnabled's 3rd bit for recursive compare
--HG--
branch : stable
sdottaka [Sat, 6 Jun 2015 09:56:54 +0000 (18:56 +0900)]
ShellExtension: SetThreadLocale() does not affect LoadString() since Vista
--HG--
branch : stable
sdottaka [Sat, 30 May 2015 12:39:57 +0000 (21:39 +0900)]
Externals: Add GnuWin32 Patch for Windows 2.5.9-7
--HG--
branch : stable
sdottaka [Sat, 30 May 2015 05:12:22 +0000 (14:12 +0900)]
WinMerge32bitPluginProxy: sign *.exe
--HG--
branch : stable
sdottaka [Sat, 30 May 2015 05:05:19 +0000 (14:05 +0900)]
IListCtrlImpl.h: Fix crash introduced in rev.8331
--HG--
branch : stable
sdottaka [Fri, 29 May 2015 14:02:32 +0000 (23:02 +0900)]
Added tag 2.14.0+-jp-81 for changeset
916cd5cc03fe
--HG--
branch : stable
sdottaka [Sun, 24 May 2015 13:52:57 +0000 (22:52 +0900)]
Merge with stable
sdottaka [Sun, 24 May 2015 13:47:34 +0000 (22:47 +0900)]
Merge with stable
sdottaka [Sun, 24 May 2015 13:01:46 +0000 (22:01 +0900)]
DirView.cpp: Fix the bug introduced in rev.8296
--HG--
branch : stable
sdottaka [Sun, 24 May 2015 11:57:08 +0000 (20:57 +0900)]
Bump revision to 2.14.0+-jp-81
--HG--
branch : stable
sdottaka [Sun, 24 May 2015 11:56:50 +0000 (20:56 +0900)]
Fix VS Code Analysis warnings (C6102)
--HG--
branch : stable
sdottaka [Sun, 24 May 2015 11:44:42 +0000 (20:44 +0900)]
* Add _tcscpy_safe() to coretools.h
* Use _tcscpy_safe() and StrintCchCopy() instead of _tcscpy() and _tcsncpy()
--HG--
branch : stable
sdottaka [Sun, 24 May 2015 09:12:19 +0000 (18:12 +0900)]
Environment.cpp: Copy env_GetMyDocuments() and env_GetWindowsDirectory() from WinMerge2011
--HG--
branch : stable
sdottaka [Sun, 24 May 2015 08:53:06 +0000 (17:53 +0900)]
dllpstub.cpp: Fix for 64bit
--HG--
branch : stable
sdottaka [Sun, 24 May 2015 08:49:28 +0000 (17:49 +0900)]
FileOrFolderSelect.cpp: Use CoTaskMemFree() instead of IMalloc::Free()
--HG--
branch : stable
sdottaka [Sun, 24 May 2015 08:33:16 +0000 (17:33 +0900)]
Fix compiler warning
--HG--
branch : stable
sdottaka [Sun, 24 May 2015 06:23:33 +0000 (15:23 +0900)]
ExConverter.cpp: Fix memory leak
--HG--
branch : stable
sdottaka [Sun, 24 May 2015 01:58:09 +0000 (10:58 +0900)]
sign *.exe, *.dll and installer
--HG--
branch : stable
sdottaka [Sun, 24 May 2015 00:14:41 +0000 (09:14 +0900)]
Merge7z: Remove unused files
--HG--
branch : stable
sdottaka [Sun, 24 May 2015 00:07:11 +0000 (09:07 +0900)]
Merge7z: Remove Release and Debug solution configurations
--HG--
branch : stable
sdottaka [Sat, 23 May 2015 23:43:59 +0000 (08:43 +0900)]
Merge7z: Fix for the warning "warning MSB8030: The linker switch "Minimum Required Version" requires "SubSystem" to be set. Without "SubSystem", the "Minimum Required Version" would not be passed to linker and could prevent to the output binary from running on older Operating Systems"
--HG--
branch : stable
sdottaka [Sat, 23 May 2015 23:32:27 +0000 (08:32 +0900)]
Merge7z: Add SignMerge7z.bat
--HG--
branch : stable
sdottaka [Sat, 23 May 2015 23:32:05 +0000 (08:32 +0900)]
Merge7z: Update to VS2013
--HG--
branch : stable
sdottaka [Sat, 23 May 2015 13:34:14 +0000 (22:34 +0900)]
Plugins: Update dlls
--HG--
branch : stable
sdottaka [Sat, 23 May 2015 13:33:44 +0000 (22:33 +0900)]
ShellExtension: Add SignShellExtension.bat
--HG--
branch : stable
sdottaka [Sat, 23 May 2015 13:30:05 +0000 (22:30 +0900)]
Plugins: Add SignPlugins.bat
--HG--
branch : stable
sdottaka [Sat, 23 May 2015 13:09:33 +0000 (22:09 +0900)]
Update Externals
--HG--
branch : stable
sdottaka [Sat, 23 May 2015 13:04:01 +0000 (22:04 +0900)]
ShellExtension: Remove unused function
--HG--
branch : stable
sdottaka [Sat, 23 May 2015 13:02:22 +0000 (22:02 +0900)]
ShellExtension: Bump revision to 1.16.5.3
--HG--
branch : stable
OSDN Git Service
