OSDN Git Service

winmerge-jp/winmerge-jp.git
8 years agoAdded tag 2.14.0+-jp-84 for changeset 569d1f95bbf0
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

8 years agoImgMergeFrm.cpp: Change the registry path of Location Pane settings on Image Diff...
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

8 years agoBump revision to 2.14.0+-jp-84
sdottaka [Sun, 2 Aug 2015 02:35:24 +0000 (11:35 +0900)]
Bump revision to 2.14.0+-jp-84

--HG--
branch : stable

8 years agoAdd Location Pane on Image Merge Window
sdottaka [Sun, 2 Aug 2015 02:34:20 +0000 (11:34 +0900)]
Add Location Pane on Image Merge Window

--HG--
branch : stable

9 years agoFix compilation errors with VS2015
sdottaka [Sat, 25 Jul 2015 02:08:51 +0000 (11:08 +0900)]
Fix compilation errors with VS2015

--HG--
branch : stable

9 years agoRemove MergeApp.h dependency from some source files
sdottaka [Sun, 19 Jul 2015 12:39:00 +0000 (21:39 +0900)]
Remove MergeApp.h dependency from some source files

--HG--
branch : stable

9 years agoFileActtionScript.cpp: Remove #include "MainFrm.h"
sdottaka [Sat, 18 Jul 2015 07:17:34 +0000 (16:17 +0900)]
FileActtionScript.cpp: Remove #include "MainFrm.h"

--HG--
branch : stable

9 years agoCppcheck: The scope of the variable '...' can be reduced.
sdottaka [Sat, 18 Jul 2015 02:17:37 +0000 (11:17 +0900)]
Cppcheck: The scope of the variable '...' can be reduced.

--HG--
branch : stable

9 years agoCppcheck: Class '...' has a constructor with 1 argument that is not explicit.
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

9 years agoRemove WinMergeU.exe.manifest
sdottaka [Sat, 11 Jul 2015 09:10:04 +0000 (18:10 +0900)]
Remove WinMergeU.exe.manifest

--HG--
branch : stable

9 years agoUse Mecurial EOL Extension
sdottaka [Sat, 11 Jul 2015 04:19:42 +0000 (13:19 +0900)]
Use Mecurial EOL Extension

--HG--
branch : stable

9 years agoArchiveSupport/Merge7z/readme.txt: Fix mixed eol-style
sdottaka [Sat, 11 Jul 2015 02:54:52 +0000 (11:54 +0900)]
ArchiveSupport/Merge7z/readme.txt: Fix mixed eol-style

--HG--
branch : stable

9 years agoFix wrong help file path
sdottaka [Sat, 4 Jul 2015 14:35:07 +0000 (23:35 +0900)]
Fix wrong help file path

--HG--
branch : stable

9 years agoDirScan.cpp: Fix warnings
sdottaka [Sat, 4 Jul 2015 13:57:34 +0000 (22:57 +0900)]
DirScan.cpp: Fix warnings

--HG--
branch : stable

9 years agoBuildArc.cmd: Include GnuWin32 patch for Windows in archive file
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

9 years agoBump revision to 2.14.0+-jp-83
sdottaka [Sun, 21 Jun 2015 14:36:08 +0000 (23:36 +0900)]
Bump revision to 2.14.0+-jp-83

--HG--
branch : stable

9 years agoPlugins: Add ApplyPatch.sct
sdottaka [Sun, 21 Jun 2015 14:35:42 +0000 (23:35 +0900)]
Plugins: Add ApplyPatch.sct

--HG--
branch : stable

9 years agoMake each plugins disableable
sdottaka [Sun, 21 Jun 2015 11:10:56 +0000 (20:10 +0900)]
Make each plugins disableable

--HG--
branch : stable

9 years agoOptionsInit.cpp: Set the initial value of OPT_BREAK_TYPE to 1(Break at whitespace...
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

9 years agoCompareMSExcelFiles.sct: Fix wrong for-loop range in writeFormulas() function
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

9 years agoCompareMSExcelFiles.sct: Include shapes, which are outside of UsedRange, in worksheet...
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

9 years agocrystaledit: fix flickering when replacing text
sdottaka [Sat, 20 Jun 2015 07:46:38 +0000 (16:46 +0900)]
crystaledit: fix flickering when replacing text

--HG--
branch : stable

9 years agoMake an archive file comparable to a normal file
sdottaka [Sat, 20 Jun 2015 03:25:58 +0000 (12:25 +0900)]
Make an archive file comparable to a normal file

--HG--
branch : stable

9 years agoHexMergeDoc.cpp: Fix crash when refocusing new empty files
sdottaka [Sat, 20 Jun 2015 02:47:00 +0000 (11:47 +0900)]
HexMergeDoc.cpp: Fix crash when refocusing new empty files

--HG--
branch : stable

9 years agoExternals: Update winimerge to 79:11992dbd7e2c
sdottaka [Sat, 20 Jun 2015 02:29:39 +0000 (11:29 +0900)]
Externals: Update winimerge to 79:11992dbd7e2c

--HG--
branch : stable

9 years agoMerge.cpp: Use Meiryo UI font instead of Meiryo font
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

9 years agoInstaller: Install GnuWin32 Patch for Windows
sdottaka [Sun, 14 Jun 2015 13:08:17 +0000 (22:08 +0900)]
Installer: Install GnuWin32 Patch for Windows

--HG--
branch : stable

9 years agoBump revsion to 2.14.0+-jp-82
sdottaka [Sun, 7 Jun 2015 11:21:51 +0000 (20:21 +0900)]
Bump revsion to 2.14.0+-jp-82

--HG--
branch : stable

9 years agoUpdate translations
sdottaka [Sat, 6 Jun 2015 10:19:46 +0000 (19:19 +0900)]
Update translations

--HG--
branch : stable

9 years agoPropShell: Remove "Include subfolders by default" checkbox
sdottaka [Sat, 6 Jun 2015 10:06:12 +0000 (19:06 +0900)]
PropShell: Remove "Include subfolders by default" checkbox

--HG--
branch : stable

9 years agoShellExtension: Bump revision to 1.16.5.4
sdottaka [Sat, 6 Jun 2015 10:04:17 +0000 (19:04 +0900)]
ShellExtension: Bump revision to 1.16.5.4

--HG--
branch : stable

9 years agoShellExtension: Use HKCU\Software\Thingamahoochie\WinMerge\Settings\Recurse instead...
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

9 years agoShellExtension: SetThreadLocale() does not affect LoadString() since Vista
sdottaka [Sat, 6 Jun 2015 09:56:54 +0000 (18:56 +0900)]
ShellExtension: SetThreadLocale() does not affect LoadString() since Vista

--HG--
branch : stable

9 years agoExternals: Add GnuWin32 Patch for Windows 2.5.9-7
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

9 years agoWinMerge32bitPluginProxy: sign *.exe
sdottaka [Sat, 30 May 2015 05:12:22 +0000 (14:12 +0900)]
WinMerge32bitPluginProxy: sign *.exe

--HG--
branch : stable

9 years agoIListCtrlImpl.h: Fix crash introduced in rev.8331
sdottaka [Sat, 30 May 2015 05:05:19 +0000 (14:05 +0900)]
IListCtrlImpl.h: Fix crash introduced in rev.8331

--HG--
branch : stable

9 years agoAdded tag 2.14.0+-jp-81 for changeset 916cd5cc03fe
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

9 years agoDirView.cpp: Fix the bug introduced in rev.8296
sdottaka [Sun, 24 May 2015 13:01:46 +0000 (22:01 +0900)]
DirView.cpp: Fix the bug introduced in rev.8296

--HG--
branch : stable

9 years agoBump revision to 2.14.0+-jp-81
sdottaka [Sun, 24 May 2015 11:57:08 +0000 (20:57 +0900)]
Bump revision to 2.14.0+-jp-81

--HG--
branch : stable

9 years agoFix VS Code Analysis warnings (C6102)
sdottaka [Sun, 24 May 2015 11:56:50 +0000 (20:56 +0900)]
Fix VS Code Analysis warnings (C6102)

--HG--
branch : stable

9 years ago* Add _tcscpy_safe() to coretools.h
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

9 years agoEnvironment.cpp: Copy env_GetMyDocuments() and env_GetWindowsDirectory() from WinMerg...
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

9 years agodllpstub.cpp: Fix for 64bit
sdottaka [Sun, 24 May 2015 08:53:06 +0000 (17:53 +0900)]
dllpstub.cpp: Fix for 64bit

--HG--
branch : stable

9 years agoFileOrFolderSelect.cpp: Use CoTaskMemFree() instead of IMalloc::Free()
sdottaka [Sun, 24 May 2015 08:49:28 +0000 (17:49 +0900)]
FileOrFolderSelect.cpp: Use CoTaskMemFree() instead of IMalloc::Free()

--HG--
branch : stable

9 years agoFix compiler warning
sdottaka [Sun, 24 May 2015 08:33:16 +0000 (17:33 +0900)]
Fix compiler warning

--HG--
branch : stable

9 years agoExConverter.cpp: Fix memory leak
sdottaka [Sun, 24 May 2015 06:23:33 +0000 (15:23 +0900)]
ExConverter.cpp: Fix memory leak

--HG--
branch : stable

9 years agosign *.exe, *.dll and installer
sdottaka [Sun, 24 May 2015 01:58:09 +0000 (10:58 +0900)]
sign *.exe, *.dll and installer

--HG--
branch : stable

9 years agoMerge7z: Remove unused files
sdottaka [Sun, 24 May 2015 00:14:41 +0000 (09:14 +0900)]
Merge7z: Remove unused files

--HG--
branch : stable

9 years agoMerge7z: Remove Release and Debug solution configurations
sdottaka [Sun, 24 May 2015 00:07:11 +0000 (09:07 +0900)]
Merge7z: Remove Release and Debug solution configurations

--HG--
branch : stable

9 years agoMerge7z: Fix for the warning "warning MSB8030: The linker switch "Minimum Required...
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

9 years agoMerge7z: Add SignMerge7z.bat
sdottaka [Sat, 23 May 2015 23:32:27 +0000 (08:32 +0900)]
Merge7z: Add SignMerge7z.bat

--HG--
branch : stable

9 years agoMerge7z: Update to VS2013
sdottaka [Sat, 23 May 2015 23:32:05 +0000 (08:32 +0900)]
Merge7z: Update to VS2013

--HG--
branch : stable

9 years agoPlugins: Update dlls
sdottaka [Sat, 23 May 2015 13:34:14 +0000 (22:34 +0900)]
Plugins: Update dlls

--HG--
branch : stable

9 years agoShellExtension: Add SignShellExtension.bat
sdottaka [Sat, 23 May 2015 13:33:44 +0000 (22:33 +0900)]
ShellExtension: Add SignShellExtension.bat

--HG--
branch : stable

9 years agoPlugins: Add SignPlugins.bat
sdottaka [Sat, 23 May 2015 13:30:05 +0000 (22:30 +0900)]
Plugins: Add SignPlugins.bat

--HG--
branch : stable

9 years agoUpdate Externals
sdottaka [Sat, 23 May 2015 13:09:33 +0000 (22:09 +0900)]
Update Externals

--HG--
branch : stable

9 years agoShellExtension: Remove unused function
sdottaka [Sat, 23 May 2015 13:04:01 +0000 (22:04 +0900)]
ShellExtension: Remove unused function

--HG--
branch : stable

9 years agoShellExtension: Bump revision to 1.16.5.3
sdottaka [Sat, 23 May 2015 13:02:22 +0000 (22:02 +0900)]
ShellExtension: Bump revision to 1.16.5.3

--HG--
branch : stable

9 years agoShellExtension: Update to VS2013
sdottaka [Sat, 23 May 2015 13:01:54 +0000 (22:01 +0900)]
ShellExtension: Update to VS2013

--HG--
branch : stable

9 years agoPlugins: Bump revisions
sdottaka [Sat, 23 May 2015 12:50:37 +0000 (21:50 +0900)]
Plugins: Bump revisions

--HG--
branch : stable

9 years agoPlugins: Update to VS2013
sdottaka [Sat, 23 May 2015 12:49:32 +0000 (21:49 +0900)]
Plugins: Update to VS2013

--HG--
branch : stable

9 years agoDon't use SSE2 instructions for Pentium III
sdottaka [Sat, 23 May 2015 12:39:34 +0000 (21:39 +0900)]
Don't use SSE2 instructions for Pentium III

--HG--
branch : stable

9 years agoAllow using environment variables in temporary path name
sdottaka [Sun, 17 May 2015 13:45:25 +0000 (22:45 +0900)]
Allow using environment variables in temporary path name

--HG--
branch : stable

9 years agoUse paths_*() functions instead of shlwapi functions
sdottaka [Sun, 17 May 2015 05:27:31 +0000 (14:27 +0900)]
Use paths_*() functions instead of shlwapi functions

--HG--
branch : stable

9 years agoChildFrm.cpp: Use ucr::toTString() instad of A2CT() for the warning "C6255 Unprotecte...
sdottaka [Sun, 17 May 2015 03:53:09 +0000 (12:53 +0900)]
ChildFrm.cpp: Use ucr::toTString() instad of A2CT() for the warning "C6255 Unprotected use of alloca"

--HG--
branch : stable

9 years agoMerge.vcxproj: Use $(OutDir) macro
sdottaka [Sun, 17 May 2015 03:35:32 +0000 (12:35 +0900)]
Merge.vcxproj: Use $(OutDir) macro

--HG--
branch : stable

9 years agoReduce compiler warnings
sdottaka [Sat, 16 May 2015 13:23:40 +0000 (22:23 +0900)]
Reduce compiler warnings

--HG--
branch : stable

9 years agodiff.h: reduce compiler warnings
sdottaka [Sat, 16 May 2015 13:08:42 +0000 (22:08 +0900)]
diff.h: reduce compiler warnings

--HG--
branch : stable

9 years agocrystaledit: reduce compile warnings
sdottaka [Sat, 16 May 2015 11:18:06 +0000 (20:18 +0900)]
crystaledit: reduce compile warnings

--HG--
branch : stable

9 years agoOptionDef.*: Reduce the source code size
sdottaka [Sat, 16 May 2015 10:52:13 +0000 (19:52 +0900)]
OptionDef.*: Reduce the source code size

--HG--
branch : stable

11 years ago* Add paths_AddTrailingSlash() & use it
sdottaka [Sun, 30 Jun 2013 10:21:43 +0000 (19:21 +0900)]
* Add paths_AddTrailingSlash() & use it
* Use paths_ConcatPath()

--HG--
branch : stable

9 years agoOptionsDef.*: Reduce executable file size
sdottaka [Sun, 10 May 2015 12:01:29 +0000 (21:01 +0900)]
OptionsDef.*: Reduce executable file size

--HG--
branch : stable

9 years agoReduce source code size
sdottaka [Sun, 10 May 2015 09:09:12 +0000 (18:09 +0900)]
Reduce source code size

--HG--
branch : stable

9 years agoMove ID_OPTIONS_SHOW* menu handler in CMainFrame to CDirView
sdottaka [Sun, 10 May 2015 05:23:22 +0000 (14:23 +0900)]
Move ID_OPTIONS_SHOW* menu handler in CMainFrame to CDirView

--HG--
branch : stable

9 years agoMove ID_VIEW_WHITESPACE menu handler in CMainFrame to CMergeEditView
sdottaka [Sat, 9 May 2015 14:30:24 +0000 (23:30 +0900)]
Move ID_VIEW_WHITESPACE menu handler in CMainFrame to CMergeEditView

--HG--
branch : stable

9 years agoMainFrm.cpp: Reduce compile warnings
sdottaka [Sat, 9 May 2015 13:29:00 +0000 (22:29 +0900)]
MainFrm.cpp: Reduce compile warnings

--HG--
branch : stable

9 years agoMerge.vcxproj: Reduce file size
sdottaka [Fri, 8 May 2015 14:47:04 +0000 (23:47 +0900)]
Merge.vcxproj: Reduce file size

--HG--
branch : stable

9 years agoUse SysLink control instead of CStaticLink class
sdottaka [Thu, 7 May 2015 15:38:24 +0000 (00:38 +0900)]
Use SysLink control instead of CStaticLink class

--HG--
branch : stable

9 years agoRemove CMoveConstraint dependency from LoadSaveCodepageDlg.{cpp, h}
sdottaka [Thu, 7 May 2015 11:11:39 +0000 (20:11 +0900)]
Remove CMoveConstraint dependency from LoadSaveCodepageDlg.{cpp, h}

--HG--
branch : stable

9 years agoRemove CSubclass.{cpp, h}
sdottaka [Thu, 7 May 2015 11:04:51 +0000 (20:04 +0900)]
Remove CSubclass.{cpp, h}

--HG--
branch : stable

9 years agoUpdate translations
sdottaka [Sun, 3 May 2015 15:42:37 +0000 (00:42 +0900)]
Update translations

--HG--
branch : stable

9 years agoUse CWaitCursor class instead of WaitStatusCursor class for reducing .po file size
sdottaka [Sun, 3 May 2015 15:41:40 +0000 (00:41 +0900)]
Use CWaitCursor class instead of WaitStatusCursor class for reducing .po file size

--HG--
branch : stable

9 years agoRemove unused codes
sdottaka [Sun, 3 May 2015 14:48:42 +0000 (23:48 +0900)]
Remove unused codes

--HG--
branch : stable

9 years agoRemove some #ifdef _DEBUG blocks
sdottaka [Sun, 3 May 2015 14:15:35 +0000 (23:15 +0900)]
Remove some #ifdef _DEBUG blocks

--HG--
branch : stable

9 years agoFilepathEdit.cpp: Fix mixed eol-style
sdottaka [Sun, 3 May 2015 12:37:23 +0000 (21:37 +0900)]
FilepathEdit.cpp: Fix mixed eol-style

--HG--
branch : stable

9 years agoFix wrong file names in @file
sdottaka [Sun, 3 May 2015 03:21:48 +0000 (12:21 +0900)]
Fix wrong file names in @file

--HG--
branch : stable

9 years agoAdded tag 2.14.0+-jp-80 for changeset 64c9b8a8a876
sdottaka [Tue, 28 Apr 2015 14:38:00 +0000 (23:38 +0900)]
Added tag 2.14.0+-jp-80 for changeset 64c9b8a8a876

--HG--
branch : stable

9 years agoBump revision to 2.14.0+-jp-80
sdottaka [Sun, 26 Apr 2015 13:06:13 +0000 (22:06 +0900)]
Bump revision to 2.14.0+-jp-80

--HG--
branch : stable

9 years agoUpdate translations
sdottaka [Sun, 26 Apr 2015 12:54:02 +0000 (21:54 +0900)]
Update translations

--HG--
branch : stable

9 years agoPropShell.*: Add Register/Unregister shell extension buttons on Shell Options dialog
sdottaka [Sun, 26 Apr 2015 12:53:39 +0000 (21:53 +0900)]
PropShell.*: Add Register/Unregister shell extension buttons on Shell Options dialog

--HG--
branch : stable

9 years agoMDITabBar.cpp: Fix for High Contrast Themes
sdottaka [Sun, 26 Apr 2015 12:12:45 +0000 (21:12 +0900)]
MDITabBar.cpp: Fix for High Contrast Themes

--HG--
branch : stable

9 years agoLineFiltersList.cpp: Ignore empty line filter
sdottaka [Sat, 25 Apr 2015 14:59:58 +0000 (23:59 +0900)]
LineFiltersList.cpp: Ignore empty line filter

--HG--
branch : stable

9 years agoFilepathEdit.*: Adjust top margin in edit control
sdottaka [Sat, 25 Apr 2015 14:52:51 +0000 (23:52 +0900)]
FilepathEdit.*: Adjust top margin in edit control

--HG--
branch : stable

9 years agoOpenView.*: Handle Ctrl+A key
sdottaka [Sat, 25 Apr 2015 13:56:06 +0000 (22:56 +0900)]
OpenView.*: Handle Ctrl+A key

--HG--
branch : stable

9 years agoMDITabBar: Make tab bar flat
sdottaka [Sat, 25 Apr 2015 13:47:15 +0000 (22:47 +0900)]
MDITabBar: Make tab bar flat

--HG--
branch : stable

9 years agoBump revision to 2.14.0+-jp-79
sdottaka [Sun, 19 Apr 2015 14:13:25 +0000 (23:13 +0900)]
Bump revision to 2.14.0+-jp-79

--HG--
branch : stable

9 years agoUpdate translations
sdottaka [Sun, 19 Apr 2015 14:00:10 +0000 (23:00 +0900)]
Update translations

--HG--
branch : stable

9 years agoMerge.rc: fine-tune the label positions on DirCompProgress dialog
sdottaka [Sun, 19 Apr 2015 13:59:49 +0000 (22:59 +0900)]
Merge.rc: fine-tune the label positions on DirCompProgress dialog

--HG--
branch : stable

9 years agoFix crash when recomparing selected folders non-recursively
sdottaka [Sun, 19 Apr 2015 11:11:07 +0000 (20:11 +0900)]
Fix crash when recomparing selected folders non-recursively

--HG--
branch : stable

9 years agoCompareStats.cpp: Fix mixed eol-style
sdottaka [Sun, 19 Apr 2015 11:00:17 +0000 (20:00 +0900)]
CompareStats.cpp: Fix mixed eol-style

--HG--
branch : stable