OSDN Git Service
Takashi Sawanaka [Mon, 14 Mar 2016 15:30:47 +0000 (00:30 +0900)]
Update translations
Takashi Sawanaka [Mon, 14 Mar 2016 15:29:05 +0000 (00:29 +0900)]
Add "Ignore codepage differences" option
Takashi Sawanaka [Mon, 14 Mar 2016 15:24:32 +0000 (00:24 +0900)]
MergeStatusBar.*: Colorize encoding and EOL differeces in status bar
Takashi Sawanaka [Sat, 12 Mar 2016 23:41:45 +0000 (08:41 +0900)]
Move the statusbar related code from ChildFrm.* to MergeStatusBar.*
Takashi Sawanaka [Sat, 5 Mar 2016 10:10:35 +0000 (19:10 +0900)]
Fix build error when cloning from github.com/sdottaka/winmerge-v2
Takashi Sawanaka [Sat, 27 Feb 2016 12:25:26 +0000 (21:25 +0900)]
Bump revision to 2.14.0+-jp-102
Takashi Sawanaka [Sat, 27 Feb 2016 12:25:02 +0000 (21:25 +0900)]
Give priority to UTF-8 detection even in the case of using mlang.dll
Takashi Sawanaka [Sat, 27 Feb 2016 11:39:45 +0000 (20:39 +0900)]
"Filter comments" feature did not work properly in the case of issue #41
Takashi Sawanaka [Sat, 27 Feb 2016 11:31:48 +0000 (20:31 +0900)]
CompareMSExcelFiles.sct: Add support for xltx and xltm file extensions
Takashi Sawanaka [Sat, 27 Feb 2016 11:29:41 +0000 (20:29 +0900)]
Fix crash when moving from a folder to another folder without closing the descendant File Compare window
Takashi Sawanaka [Sun, 21 Feb 2016 15:43:22 +0000 (00:43 +0900)]
Bump revision to 2.14.0+-jp-101
Takashi Sawanaka [Sun, 21 Feb 2016 12:08:22 +0000 (21:08 +0900)]
Reduce MFC dependency
Takashi Sawanaka [Sat, 20 Feb 2016 11:48:33 +0000 (20:48 +0900)]
'Ignore reparse point' option did not work properly. (And a fix for that folder filters were applied twice)
Takashi Sawanaka [Sat, 20 Feb 2016 01:01:20 +0000 (10:01 +0900)]
Use DlgUtils
Takashi Sawanaka [Sat, 20 Feb 2016 00:59:02 +0000 (09:59 +0900)]
TrDialogs.h: Use CRTP
Takashi Sawanaka [Mon, 15 Feb 2016 14:23:02 +0000 (23:23 +0900)]
Bump revision to 2.14.0+-jp-100
Takashi Sawanaka [Sun, 14 Feb 2016 08:30:15 +0000 (17:30 +0900)]
Move a part of CMainFrame::OnToolsGeneratePatch() to DirView and MergeDoc
Takashi Sawanaka [Sun, 14 Feb 2016 05:37:56 +0000 (14:37 +0900)]
Use CheckDlgButton() instead of SetDlgItemChecked()
Takashi Sawanaka [Sun, 14 Feb 2016 04:55:46 +0000 (13:55 +0900)]
OpenDlg: Add Read-only checkbox to OpenDlg (2)
Takashi Sawanaka [Sun, 14 Feb 2016 03:46:38 +0000 (12:46 +0900)]
Change eol-style to CRLF
Takashi Sawanaka [Sun, 14 Feb 2016 03:43:17 +0000 (12:43 +0900)]
Merge.rc: Clean-up Merge.rc
Takashi Sawanaka [Sun, 14 Feb 2016 03:32:08 +0000 (12:32 +0900)]
resource.h: clean up resource.h
Takashi Sawanaka [Sun, 14 Feb 2016 03:24:43 +0000 (12:24 +0900)]
OpenDlg: Add Read-only checkbox to OpenDlg
Takashi Sawanaka [Sun, 14 Feb 2016 02:26:19 +0000 (11:26 +0900)]
OpenDlg: Fix for invisible cursor
Takashi Sawanaka [Sun, 14 Feb 2016 01:24:00 +0000 (10:24 +0900)]
Add the following methods:
CTrDialog::SetDlgItemChecked()
CTrDialog::EnableDlgItem()
CTrDialog::SetDlgItemFocus()
CTrDialog::GetDlgItemText()
CTrDialog::SetDlgItemText()
Takashi Sawanaka [Sun, 7 Feb 2016 01:30:07 +0000 (10:30 +0900)]
Reduce Merge.h dependency
Takashi Sawanaka [Sat, 6 Feb 2016 10:42:04 +0000 (19:42 +0900)]
resource.h: Renumber resource IDs
Takashi Sawanaka [Sat, 6 Feb 2016 01:55:32 +0000 (10:55 +0900)]
Merge.rc: To prevent that VisualStudio edits Version Info block, move it to Merge2.rc
Takashi Sawanaka [Sat, 6 Feb 2016 01:44:28 +0000 (10:44 +0900)]
Make Merge.rc editable by Visual Studio
Takashi Sawanaka [Sun, 31 Jan 2016 11:31:21 +0000 (20:31 +0900)]
Cppcheck: Unused variable: ...
Takashi Sawanaka [Sun, 31 Jan 2016 11:30:49 +0000 (20:30 +0900)]
Cppcheck: The scope of the variable '...' can be reduced.
Takashi Sawanaka [Sun, 31 Jan 2016 09:54:18 +0000 (18:54 +0900)]
Cppcheck: Class '...' has a constructor with 1 argument that is not explicit.
Takashi Sawanaka [Sun, 31 Jan 2016 09:44:42 +0000 (18:44 +0900)]
Cppcheck: Member variable '...' is not initialized in the constructor.
Takashi Sawanaka [Sun, 31 Jan 2016 08:28:06 +0000 (17:28 +0900)]
Remove THIS_FILE
Takashi Sawanaka [Sun, 31 Jan 2016 07:01:55 +0000 (16:01 +0900)]
Simplify SharedFilterDlg code
Takashi Sawanaka [Sun, 31 Jan 2016 00:38:08 +0000 (09:38 +0900)]
Cppcheck: C-style pointer casting
Takashi Sawanaka [Sat, 30 Jan 2016 14:50:35 +0000 (23:50 +0900)]
Reduce logo.jpg file size
Takashi Sawanaka [Sat, 30 Jan 2016 11:11:56 +0000 (20:11 +0900)]
Add "Swap Panes" menu item to Folder Compare Window (2)
Takashi Sawanaka [Fri, 29 Jan 2016 14:46:43 +0000 (23:46 +0900)]
Added tag 2.14.0+-jp-99 for changeset
30d78e69eb15
Takashi Sawanaka [Wed, 27 Jan 2016 14:41:16 +0000 (23:41 +0900)]
Bump revision to 2.14.0+-jp-99
Takashi Sawanaka [Wed, 27 Jan 2016 14:38:22 +0000 (23:38 +0900)]
DirActions.cpp: Fix crash when removing files
Takashi Sawanaka [Mon, 25 Jan 2016 15:04:44 +0000 (00:04 +0900)]
Update translations (5)
Takashi Sawanaka [Mon, 25 Jan 2016 15:03:57 +0000 (00:03 +0900)]
Update translations (4)
Takashi Sawanaka [Mon, 25 Jan 2016 15:01:44 +0000 (00:01 +0900)]
Update translations (3)
Takashi Sawanaka [Mon, 25 Jan 2016 14:58:05 +0000 (23:58 +0900)]
Update translations (2)
Takashi Sawanaka [Mon, 25 Jan 2016 14:57:10 +0000 (23:57 +0900)]
Update translations (1)
Takashi Sawanaka [Mon, 25 Jan 2016 14:56:16 +0000 (23:56 +0900)]
Bump revision to 2.14.0+-jp-98
Takashi Sawanaka [Mon, 25 Jan 2016 14:53:34 +0000 (23:53 +0900)]
Translations: Use unique ID instead of line number to identify resource strings.
This makes commit size small when modified the Merge.rc file.
Takashi Sawanaka [Sun, 24 Jan 2016 07:45:24 +0000 (16:45 +0900)]
Add 48x48 icons(5)
Takashi Sawanaka [Sun, 24 Jan 2016 07:44:55 +0000 (16:44 +0900)]
Add 48x48 icons(4)
Takashi Sawanaka [Sun, 24 Jan 2016 07:44:21 +0000 (16:44 +0900)]
Add 48x48 icons(3)
Takashi Sawanaka [Sun, 24 Jan 2016 07:43:41 +0000 (16:43 +0900)]
Add 48x48 icons(2)
Takashi Sawanaka [Sun, 24 Jan 2016 07:41:22 +0000 (16:41 +0900)]
Add 48x48 icons
Takashi Sawanaka [Sun, 24 Jan 2016 07:40:15 +0000 (16:40 +0900)]
ShellExtension: Add 48x48 icons
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
Takashi Sawanaka [Sat, 23 Jan 2016 12:27:30 +0000 (21:27 +0900)]
Add Compare Statistics dialog for 3-way folder compare
Takashi Sawanaka [Sat, 23 Jan 2016 05:04:42 +0000 (14:04 +0900)]
Remove sigma.ico
Takashi Sawanaka [Fri, 22 Jan 2016 16:26:39 +0000 (01:26 +0900)]
ShellExtension: context menu items were not translated on Windows XP
Takashi Sawanaka [Sun, 17 Jan 2016 09:14:00 +0000 (18:14 +0900)]
Re-add DisplayXMLFiles.dll to zip archive(2)
Takashi Sawanaka [Sun, 17 Jan 2016 08:52:40 +0000 (17:52 +0900)]
Re-add DisplayXMLFiles.dll to zip archive
Takashi Sawanaka [Sun, 17 Jan 2016 08:48:45 +0000 (17:48 +0900)]
Bump revision to 2.14.0+-jp-97
Takashi Sawanaka [Sun, 17 Jan 2016 08:02:53 +0000 (17:02 +0900)]
Add 24x24 and 32x32 icons for high DPI display
Takashi Sawanaka [Sun, 17 Jan 2016 08:01:23 +0000 (17:01 +0900)]
Update Merge.vcxproj.filters
Takashi Sawanaka [Sun, 17 Jan 2016 06:21:59 +0000 (15:21 +0900)]
Update translation(4)
Takashi Sawanaka [Sun, 17 Jan 2016 06:21:30 +0000 (15:21 +0900)]
Update translation(3)
Takashi Sawanaka [Sun, 17 Jan 2016 06:19:49 +0000 (15:19 +0900)]
Update translation(2)
Takashi Sawanaka [Sun, 17 Jan 2016 06:16:39 +0000 (15:16 +0900)]
Update translation(1)
Takashi Sawanaka [Sun, 10 Jan 2016 14:15:55 +0000 (23:15 +0900)]
Update .hgsub
Takashi Sawanaka [Sun, 10 Jan 2016 09:04:21 +0000 (18:04 +0900)]
Bump revision to 2.14.0+-jp-96
Takashi Sawanaka [Sun, 10 Jan 2016 07:39:46 +0000 (16:39 +0900)]
Remove DisplayXMLFiles.dll from zip archive
Takashi Sawanaka [Sun, 10 Jan 2016 07:34:36 +0000 (16:34 +0900)]
Fix infinite loop when comparing folders that have a item
Takashi Sawanaka [Sun, 10 Jan 2016 06:53:27 +0000 (15:53 +0900)]
Add "Swap Panes" menu item to Folder Compare window
Takashi Sawanaka [Sat, 9 Jan 2016 01:59:53 +0000 (10:59 +0900)]
Merge.rc: fine-tune positions for high DPI displays
sdottaka [Wed, 30 Dec 2015 00:52:40 +0000 (09:52 +0900)]
Added tag 2.14.0+-jp-95 for changeset
1a21c9ece6d3
sdottaka [Tue, 29 Dec 2015 15:13:04 +0000 (00:13 +0900)]
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
sdottaka [Tue, 29 Dec 2015 12:36:47 +0000 (21:36 +0900)]
Bump revision to 2.14.0+-jp-95
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
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
sdottaka [Tue, 29 Dec 2015 12:28:47 +0000 (21:28 +0900)]
ShellExtension: Forgot to bump revision
sdottaka [Mon, 28 Dec 2015 15:43:33 +0000 (00:43 +0900)]
Added tag 2.14.0+-jp-94 for changeset
5f748abdc98e
sdottaka [Mon, 28 Dec 2015 07:49:43 +0000 (16:49 +0900)]
Downgrade project files from VS2015 to VS2013
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
Takashi Sawanaka [Sun, 27 Dec 2015 01:05:37 +0000 (10:05 +0900)]
Bump revision to 2.14.0+-jp-94
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
Takashi Sawanaka [Sat, 26 Dec 2015 12:54:35 +0000 (21:54 +0900)]
DirActions.h: Use std::count()
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
sdottaka@users.sourceforge.net [Sun, 13 Dec 2015 07:00:49 +0000 (16:00 +0900)]
2.14.0+-jp-93 タグをチェンジセット
9622fa623f8d に追加しました
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
sdottaka@users.sourceforge.net [Sun, 13 Dec 2015 05:42:31 +0000 (14:42 +0900)]
Bump revision to 2.14.0+-jp-93
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"'
sdottaka@users.sourceforge.net [Sun, 13 Dec 2015 02:04:45 +0000 (11:04 +0900)]
ShellExtension: Bump revision to 1.16.5.6
sdottaka@users.sourceforge.net [Sun, 13 Dec 2015 02:04:22 +0000 (11:04 +0900)]
ShellExtension: Upgrade solution file to VS2015
sdottaka@users.sourceforge.net [Sun, 13 Dec 2015 02:03:15 +0000 (11:03 +0900)]
ShellExtension: Update WinMerge*32.bmp
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
sdottaka [Sun, 6 Dec 2015 14:17:13 +0000 (23:17 +0900)]
Upgrade project files to VS2015(3)
sdottaka@users.sourceforge.net [Sun, 6 Dec 2015 13:26:50 +0000 (22:26 +0900)]
Upgrade project files to VS2015 (2)
sdottaka [Sun, 6 Dec 2015 08:10:56 +0000 (17:10 +0900)]
Upgrade project files to VS2015
sdottaka [Sun, 29 Nov 2015 12:56:57 +0000 (21:56 +0900)]
Merge
sdottaka [Sun, 29 Nov 2015 12:55:52 +0000 (21:55 +0900)]
Merge with stable