OSDN Git Service

winmerge-jp/winmerge-jp.git
8 years agoAdd 48x48 icons(3)
Takashi Sawanaka [Sun, 24 Jan 2016 07:44:21 +0000 (16:44 +0900)]
Add 48x48 icons(3)

8 years agoAdd 48x48 icons(2)
Takashi Sawanaka [Sun, 24 Jan 2016 07:43:41 +0000 (16:43 +0900)]
Add 48x48 icons(2)

8 years agoAdd 48x48 icons
Takashi Sawanaka [Sun, 24 Jan 2016 07:41:22 +0000 (16:41 +0900)]
Add 48x48 icons

8 years agoShellExtension: Add 48x48 icons
Takashi Sawanaka [Sun, 24 Jan 2016 07:40:15 +0000 (16:40 +0900)]
ShellExtension: Add 48x48 icons

8 years agoEditorFilepathBar.*: Fix text cut off when changing hint font size in Windows control...
Takashi Sawanaka [Sat, 23 Jan 2016 13:08:17 +0000 (22:08 +0900)]
EditorFilepathBar.*: Fix text cut off when changing hint font size in Windows control panel

8 years agoAdd Compare Statistics dialog for 3-way folder compare
Takashi Sawanaka [Sat, 23 Jan 2016 12:27:30 +0000 (21:27 +0900)]
Add Compare Statistics dialog for 3-way folder compare

8 years agoRemove sigma.ico
Takashi Sawanaka [Sat, 23 Jan 2016 05:04:42 +0000 (14:04 +0900)]
Remove sigma.ico

8 years agoShellExtension: context menu items were not translated on Windows XP
Takashi Sawanaka [Fri, 22 Jan 2016 16:26:39 +0000 (01:26 +0900)]
ShellExtension: context menu items were not translated on Windows XP

8 years agoRe-add DisplayXMLFiles.dll to zip archive(2)
Takashi Sawanaka [Sun, 17 Jan 2016 09:14:00 +0000 (18:14 +0900)]
Re-add DisplayXMLFiles.dll to zip archive(2)

8 years agoRe-add DisplayXMLFiles.dll to zip archive
Takashi Sawanaka [Sun, 17 Jan 2016 08:52:40 +0000 (17:52 +0900)]
Re-add DisplayXMLFiles.dll to zip archive

8 years agoBump revision to 2.14.0+-jp-97
Takashi Sawanaka [Sun, 17 Jan 2016 08:48:45 +0000 (17:48 +0900)]
Bump revision to 2.14.0+-jp-97

8 years agoAdd 24x24 and 32x32 icons for high DPI display
Takashi Sawanaka [Sun, 17 Jan 2016 08:02:53 +0000 (17:02 +0900)]
Add 24x24 and 32x32 icons for high DPI display

8 years agoUpdate Merge.vcxproj.filters
Takashi Sawanaka [Sun, 17 Jan 2016 08:01:23 +0000 (17:01 +0900)]
Update Merge.vcxproj.filters

8 years agoUpdate translation(4)
Takashi Sawanaka [Sun, 17 Jan 2016 06:21:59 +0000 (15:21 +0900)]
Update translation(4)

8 years agoUpdate translation(3)
Takashi Sawanaka [Sun, 17 Jan 2016 06:21:30 +0000 (15:21 +0900)]
Update translation(3)

8 years agoUpdate translation(2)
Takashi Sawanaka [Sun, 17 Jan 2016 06:19:49 +0000 (15:19 +0900)]
Update translation(2)

8 years agoUpdate translation(1)
Takashi Sawanaka [Sun, 17 Jan 2016 06:16:39 +0000 (15:16 +0900)]
Update translation(1)

8 years agoUpdate .hgsub
Takashi Sawanaka [Sun, 10 Jan 2016 14:15:55 +0000 (23:15 +0900)]
Update .hgsub

8 years agoBump revision to 2.14.0+-jp-96
Takashi Sawanaka [Sun, 10 Jan 2016 09:04:21 +0000 (18:04 +0900)]
Bump revision to 2.14.0+-jp-96

8 years agoRemove DisplayXMLFiles.dll from zip archive
Takashi Sawanaka [Sun, 10 Jan 2016 07:39:46 +0000 (16:39 +0900)]
Remove DisplayXMLFiles.dll from zip archive

8 years agoFix infinite loop when comparing folders that have a item
Takashi Sawanaka [Sun, 10 Jan 2016 07:34:36 +0000 (16:34 +0900)]
Fix infinite loop when comparing folders that have a item

8 years agoAdd "Swap Panes" menu item to Folder Compare window
Takashi Sawanaka [Sun, 10 Jan 2016 06:53:27 +0000 (15:53 +0900)]
Add "Swap Panes" menu item to Folder Compare window

8 years agoMerge.rc: fine-tune positions for high DPI displays
Takashi Sawanaka [Sat, 9 Jan 2016 01:59:53 +0000 (10:59 +0900)]
Merge.rc: fine-tune positions for high DPI displays

8 years agoAdded tag 2.14.0+-jp-95 for changeset 1a21c9ece6d3
sdottaka [Wed, 30 Dec 2015 00:52:40 +0000 (09:52 +0900)]
Added tag 2.14.0+-jp-95 for changeset 1a21c9ece6d3

8 years agoDowngrade project file from VS2015 to VS2013 2.14.0+-jp-95
sdottaka [Tue, 29 Dec 2015 15:13:04 +0000 (00:13 +0900)]
Downgrade project file from VS2015 to VS2013

8 years agoShellExtension: Downgrade project file from VS2015 to VS2013
sdottaka [Tue, 29 Dec 2015 12:53:54 +0000 (21:53 +0900)]
ShellExtension: Downgrade project file from VS2015 to VS2013

8 years agoBump revision to 2.14.0+-jp-95
sdottaka [Tue, 29 Dec 2015 12:36:47 +0000 (21:36 +0900)]
Bump revision to 2.14.0+-jp-95

8 years agoDirActions.h: [Copy/Left to ...] or [Copy/Right to...] menu item did not work properly
sdottaka [Tue, 29 Dec 2015 12:36:26 +0000 (21:36 +0900)]
DirActions.h: [Copy/Left to ...] or [Copy/Right to...] menu item did not work properly

8 years agoBuildArc.cmd: Copy only ReadMe-Japanese.txt to Zip archive file
sdottaka [Tue, 29 Dec 2015 12:32:36 +0000 (21:32 +0900)]
BuildArc.cmd: Copy only ReadMe-Japanese.txt to Zip archive file
Include vcomp140.dll instead of vcomp120.dll

8 years agoShellExtension: Forgot to bump revision
sdottaka [Tue, 29 Dec 2015 12:28:47 +0000 (21:28 +0900)]
ShellExtension: Forgot to bump revision

8 years agoAdded tag 2.14.0+-jp-94 for changeset 5f748abdc98e
sdottaka [Mon, 28 Dec 2015 15:43:33 +0000 (00:43 +0900)]
Added tag 2.14.0+-jp-94 for changeset 5f748abdc98e

8 years agoDowngrade project files from VS2015 to VS2013 2.14.0+-jp-94
sdottaka [Mon, 28 Dec 2015 07:49:43 +0000 (16:49 +0900)]
Downgrade project files from VS2015 to VS2013

8 years agoPatchHTML.cpp: Use monospace font instad of sans-serif font for HTML style diff output
sdottaka [Sun, 27 Dec 2015 14:20:50 +0000 (23:20 +0900)]
PatchHTML.cpp: Use monospace font instad of sans-serif font for HTML style diff output

8 years agoBump revision to 2.14.0+-jp-94
Takashi Sawanaka [Sun, 27 Dec 2015 01:05:37 +0000 (10:05 +0900)]
Bump revision to 2.14.0+-jp-94

8 years agoThere is no need to call DestroyIcon() function for icons loaded with LoadIcon()...
Takashi Sawanaka [Sat, 26 Dec 2015 14:38:41 +0000 (23:38 +0900)]
There is no need to call DestroyIcon() function for icons loaded with LoadIcon() function

8 years agoDirActions.h: Use std::count()
Takashi Sawanaka [Sat, 26 Dec 2015 12:54:35 +0000 (21:54 +0900)]
DirActions.h: Use std::count()

8 years agoDirActions.h: Could not rename the file that exists in only left or right side
Takashi Sawanaka [Sat, 26 Dec 2015 12:45:43 +0000 (21:45 +0900)]
DirActions.h: Could not rename the file that exists in only left or right side

8 years ago2.14.0+-jp-93 タグをチェンジセット 9622fa623f8d に追加しました
sdottaka@users.sourceforge.net [Sun, 13 Dec 2015 07:00:49 +0000 (16:00 +0900)]
2.14.0+-jp-93 タグをチェンジセット 9622fa623f8d に追加しました

8 years ago- Use vcomp140.dll instead of vcomp120.dll 2.14.0+-jp-93
sdottaka@users.sourceforge.net [Sun, 13 Dec 2015 06:28:35 +0000 (15:28 +0900)]
- Use vcomp140.dll instead of vcomp120.dll
- Change the value of WizardImageStretch to 'true' for high DPI
- Change Readme path

8 years agoBump revision to 2.14.0+-jp-93
sdottaka@users.sourceforge.net [Sun, 13 Dec 2015 05:42:31 +0000 (14:42 +0900)]
Bump revision to 2.14.0+-jp-93

8 years agoManual: Fix the warning 'warning: failed to load external entity "../Text_encoding...
sdottaka@users.sourceforge.net [Sun, 13 Dec 2015 02:37:04 +0000 (11:37 +0900)]
Manual: Fix the warning 'warning: failed to load external entity "../Text_encoding.xml"'

8 years agoShellExtension: Bump revision to 1.16.5.6
sdottaka@users.sourceforge.net [Sun, 13 Dec 2015 02:04:45 +0000 (11:04 +0900)]
ShellExtension: Bump revision to 1.16.5.6

8 years agoShellExtension: Upgrade solution file to VS2015
sdottaka@users.sourceforge.net [Sun, 13 Dec 2015 02:04:22 +0000 (11:04 +0900)]
ShellExtension: Upgrade solution file to VS2015

8 years agoShellExtension: Update WinMerge*32.bmp
sdottaka@users.sourceforge.net [Sun, 13 Dec 2015 02:03:15 +0000 (11:03 +0900)]
ShellExtension: Update WinMerge*32.bmp

8 years agoDirActions.h: Keep folder structure of copied files when selecting [Copy/Left to...
sdottaka@users.sourceforge.net [Sat, 12 Dec 2015 23:32:27 +0000 (08:32 +0900)]
DirActions.h: Keep folder structure of copied files when selecting [Copy/Left to...] or [Copy/Right to ..]. close #40

8 years agoUpgrade project files to VS2015(3)
sdottaka [Sun, 6 Dec 2015 14:17:13 +0000 (23:17 +0900)]
Upgrade project files to VS2015(3)

8 years agoUpgrade project files to VS2015 (2)
sdottaka@users.sourceforge.net [Sun, 6 Dec 2015 13:26:50 +0000 (22:26 +0900)]
Upgrade project files to VS2015 (2)

8 years agoUpgrade project files to VS2015
sdottaka [Sun, 6 Dec 2015 08:10:56 +0000 (17:10 +0900)]
Upgrade project files to VS2015

8 years agoMerge
sdottaka [Sun, 29 Nov 2015 12:56:57 +0000 (21:56 +0900)]
Merge

8 years agoMerge with stable
sdottaka [Sun, 29 Nov 2015 12:55:52 +0000 (21:55 +0900)]
Merge with stable

8 years agoAdded tag 2.14.0+-jp-92 for changeset 58457243de3c
sdottaka [Sun, 29 Nov 2015 02:01:37 +0000 (11:01 +0900)]
Added tag 2.14.0+-jp-92 for changeset 58457243de3c

--HG--
branch : stable

8 years agoBump revision to 2.14.0+-jp-92 2.14.0+-jp-92
sdottaka [Sun, 29 Nov 2015 01:59:17 +0000 (10:59 +0900)]
Bump revision to 2.14.0+-jp-92

--HG--
branch : stable

8 years agoIListCtrlImpl.h: Fix mixed eol-style
sdottaka@users.sourceforge.net [Sat, 28 Nov 2015 13:23:51 +0000 (22:23 +0900)]
IListCtrlImpl.h: Fix mixed eol-style

8 years agoIListCtrlImpl.h: Fix mixed eol-style
sdottaka@users.sourceforge.net [Sat, 28 Nov 2015 13:23:51 +0000 (22:23 +0900)]
IListCtrlImpl.h: Fix mixed eol-style

--HG--
branch : stable

8 years agoByteComparator.cpp: Remove unused variable
sdottaka [Sat, 28 Nov 2015 23:37:46 +0000 (08:37 +0900)]
ByteComparator.cpp: Remove unused variable

--HG--
branch : stable

8 years agoMerge with default
sdottaka [Sat, 28 Nov 2015 23:34:30 +0000 (08:34 +0900)]
Merge with default

--HG--
branch : stable

8 years agoShellExtension: Add 32x32 bitmaps
sdottaka [Sat, 28 Nov 2015 05:10:34 +0000 (14:10 +0900)]
ShellExtension: Add 32x32 bitmaps

8 years agoFix issue #39. HTML files were hidden in NTFS Alternate Data Streams
sdottaka [Sat, 28 Nov 2015 02:35:31 +0000 (11:35 +0900)]
Fix issue #39. HTML files were hidden in NTFS Alternate Data Streams

8 years agoBump revision to 2.14.0+-jp-91
sdottaka [Mon, 23 Nov 2015 20:26:31 +0000 (05:26 +0900)]
Bump revision to 2.14.0+-jp-91

8 years agoAvoid creating FilterCommentsManager object every times when files are compared
sdottaka [Mon, 23 Nov 2015 16:21:57 +0000 (01:21 +0900)]
Avoid creating FilterCommentsManager object every times when files are compared

8 years agofine-tune label positions
sdottaka [Sun, 22 Nov 2015 12:40:04 +0000 (21:40 +0900)]
fine-tune label positions

8 years agoBump revision to 2.14.0+-jp-90
sdottaka [Sun, 15 Nov 2015 10:52:15 +0000 (19:52 +0900)]
Bump revision to 2.14.0+-jp-90

8 years agoRemove #if defined(_AFXDLL) because of using MFC static library now
sdottaka [Sun, 15 Nov 2015 10:51:45 +0000 (19:51 +0900)]
Remove #if defined(_AFXDLL) because of using MFC static library now

8 years agoDirDoc.cpp: Fix crash when closing Options dialog
sdottaka [Fri, 13 Nov 2015 16:04:42 +0000 (01:04 +0900)]
DirDoc.cpp: Fix crash when closing Options dialog

8 years agoBump revision to 2.14.0+-jp-89
sdottaka [Sat, 31 Oct 2015 05:31:04 +0000 (14:31 +0900)]
Bump revision to 2.14.0+-jp-89

8 years agoFix wrong short result column on DirView
sdottaka [Sat, 31 Oct 2015 04:47:24 +0000 (13:47 +0900)]
Fix wrong short result column on DirView

8 years agoAdded tag 2.14.0+-jp-88 for changeset 69245696abe7
sdottaka [Thu, 29 Oct 2015 14:38:26 +0000 (23:38 +0900)]
Added tag 2.14.0+-jp-88 for changeset 69245696abe7

8 years agoBump revision to 2.14.0+-jp-88 2.14.0+-jp-88
sdottaka [Mon, 26 Oct 2015 16:35:16 +0000 (01:35 +0900)]
Bump revision to 2.14.0+-jp-88

8 years agoShellExtension.cpp: Remove the code for old Windows versions
sdottaka [Mon, 26 Oct 2015 16:34:57 +0000 (01:34 +0900)]
ShellExtension.cpp: Remove the code for old Windows versions

8 years agoShellExtension.vcxproj: Remove unused source file
sdottaka [Mon, 26 Oct 2015 16:24:56 +0000 (01:24 +0900)]
ShellExtension.vcxproj: Remove unused source file

8 years agoThe font size of the file compare window was not changed when Windows DPI setting...
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

8 years agoBump revision to 2.14.0+-jp-87
sdottaka [Sun, 18 Oct 2015 14:02:11 +0000 (23:02 +0900)]
Bump revision to 2.14.0+-jp-87

8 years agoFilepathEdit.cpp: Fix that text on the header bar disappears when mouse pointer hover...
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

8 years agoMerge.vcxproj.filters: Move BCMenu.cpp and etc to MFCGui/Common folder
sdottaka [Sun, 18 Oct 2015 13:42:35 +0000 (22:42 +0900)]
Merge.vcxproj.filters: Move BCMenu.cpp and etc to MFCGui/Common folder

8 years agoReplace UINT with unsigned
sdottaka [Sat, 10 Oct 2015 15:29:13 +0000 (00:29 +0900)]
Replace UINT with unsigned

8 years agoAdded tag 2.14.0+-jp-86 for changeset f116be911162
sdottaka [Mon, 28 Sep 2015 15:16:24 +0000 (00:16 +0900)]
Added tag 2.14.0+-jp-86 for changeset f116be911162

8 years agoBump revision to 2.14.0+-jp-86 2.14.0+-jp-86
sdottaka [Mon, 21 Sep 2015 10:36:30 +0000 (19:36 +0900)]
Bump revision to 2.14.0+-jp-86

8 years agoAdd boost/range/mfc.hpp
sdottaka [Mon, 21 Sep 2015 10:28:45 +0000 (19:28 +0900)]
Add boost/range/mfc.hpp

8 years agoUpdate translations
sdottaka [Mon, 21 Sep 2015 08:21:49 +0000 (17:21 +0900)]
Update translations

8 years agoAdd Include Subfolders menu item to IDR_POPUP_DIFF_OPTIONS popup menu
sdottaka [Mon, 21 Sep 2015 07:04:47 +0000 (16:04 +0900)]
Add Include Subfolders menu item to IDR_POPUP_DIFF_OPTIONS popup menu

8 years agoDirItemIterator.h: Fix crash when entering empty folders
sdottaka [Sun, 20 Sep 2015 13:38:20 +0000 (22:38 +0900)]
DirItemIterator.h: Fix crash when entering empty folders

8 years agoEnvironment.cpp: Synchronize with stable branch
sdottaka [Sun, 20 Sep 2015 09:46:05 +0000 (18:46 +0900)]
Environment.cpp: Synchronize with stable branch

8 years agoDireItemIterator.h: Use nullptr instead of NULL
sdottaka [Sun, 20 Sep 2015 07:49:40 +0000 (16:49 +0900)]
DireItemIterator.h: Use nullptr instead of NULL

8 years agoFix DirActions::IsItemFile() function to work properly
sdottaka [Sun, 20 Sep 2015 07:44:38 +0000 (16:44 +0900)]
Fix DirActions::IsItemFile() function to work properly

8 years agoUse std::stoi() instead of string_stoi()
sdottaka [Sun, 20 Sep 2015 03:55:21 +0000 (12:55 +0900)]
Use std::stoi() instead of string_stoi()

8 years agounicoder.cpp: Remove needless code
sdottaka [Sun, 20 Sep 2015 03:54:03 +0000 (12:54 +0900)]
unicoder.cpp: Remove needless code

8 years agoLanguageSelect.h: Remove unused #include
sdottaka [Sun, 20 Sep 2015 03:49:38 +0000 (12:49 +0900)]
LanguageSelect.h: Remove unused #include

8 years agoRemove CSubClass.cpp from Merge.vcxproj.filters
sdottaka [Sat, 19 Sep 2015 14:04:38 +0000 (23:04 +0900)]
Remove CSubClass.cpp from Merge.vcxproj.filters

8 years agoInclude vcomp120.dll in installer and archive files for WinIMergeLib.dll
sdottaka [Sat, 19 Sep 2015 13:27:42 +0000 (22:27 +0900)]
Include vcomp120.dll in installer and archive files for WinIMergeLib.dll

8 years agoDo not include SignShellExtension.bat in archive files
sdottaka [Sat, 19 Sep 2015 13:20:54 +0000 (22:20 +0900)]
Do not include SignShellExtension.bat in archive files

8 years agoRemove unused files
sdottaka [Sat, 19 Sep 2015 12:13:04 +0000 (21:13 +0900)]
Remove unused files

8 years agoBuildArc.cmd: Add /y option to xcopy command to avoid confirmation
sdottaka [Sun, 13 Sep 2015 11:10:06 +0000 (20:10 +0900)]
BuildArc.cmd: Add /y option to xcopy command to avoid confirmation

8 years agoBump revision to 2.14.0+-jp-85
sdottaka [Sun, 13 Sep 2015 10:40:13 +0000 (19:40 +0900)]
Bump revision to 2.14.0+-jp-85

8 years agoMainFrm.cpp: Avoid losing recurse setting when compared items do not exist
sdottaka [Sun, 13 Sep 2015 10:26:21 +0000 (19:26 +0900)]
MainFrm.cpp: Avoid losing recurse setting when compared items do not exist

8 years agoUpdate freeimage to changeset 6:38ec4c483ab8
sdottaka [Sun, 13 Sep 2015 07:50:58 +0000 (16:50 +0900)]
Update freeimage to changeset 6:38ec4c483ab8
Update winimerge to changeset 89:640f3dc99812

8 years agoUpdate boost to 1.59.0
sdottaka [Sat, 12 Sep 2015 04:27:10 +0000 (13:27 +0900)]
Update boost to 1.59.0

8 years agoMerge with stable
sdottaka [Sun, 6 Sep 2015 15:22:19 +0000 (00:22 +0900)]
Merge with stable

8 years agoUpdate translations
sdottaka [Sun, 6 Sep 2015 15:15:03 +0000 (00:15 +0900)]
Update translations

8 years agoResume implementing 3-way folder compare
sdottaka [Sun, 6 Sep 2015 15:14:39 +0000 (00:14 +0900)]
Resume implementing 3-way folder compare

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