OSDN Git Service
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
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
sdottaka [Sat, 9 May 2015 13:29:00 +0000 (22:29 +0900)]
MainFrm.cpp: Reduce compile warnings
--HG--
branch : stable
sdottaka [Fri, 8 May 2015 14:47:04 +0000 (23:47 +0900)]
Merge.vcxproj: Reduce file size
--HG--
branch : stable
sdottaka [Thu, 7 May 2015 15:38:24 +0000 (00:38 +0900)]
Use SysLink control instead of CStaticLink class
--HG--
branch : stable
sdottaka [Thu, 7 May 2015 11:11:39 +0000 (20:11 +0900)]
Remove CMoveConstraint dependency from LoadSaveCodepageDlg.{cpp, h}
--HG--
branch : stable
sdottaka [Thu, 7 May 2015 11:04:51 +0000 (20:04 +0900)]
Remove CSubclass.{cpp, h}
--HG--
branch : stable
sdottaka [Sun, 3 May 2015 15:42:37 +0000 (00:42 +0900)]
Update translations
--HG--
branch : stable
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
sdottaka [Sun, 3 May 2015 14:48:42 +0000 (23:48 +0900)]
Remove unused codes
--HG--
branch : stable
sdottaka [Sun, 3 May 2015 14:15:35 +0000 (23:15 +0900)]
Remove some #ifdef _DEBUG blocks
--HG--
branch : stable
sdottaka [Sun, 3 May 2015 12:37:23 +0000 (21:37 +0900)]
FilepathEdit.cpp: Fix mixed eol-style
--HG--
branch : stable
sdottaka [Sun, 3 May 2015 03:21:48 +0000 (12:21 +0900)]
Fix wrong file names in @file
--HG--
branch : stable
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
sdottaka [Sun, 26 Apr 2015 13:06:13 +0000 (22:06 +0900)]
Bump revision to 2.14.0+-jp-80
--HG--
branch : stable
sdottaka [Sun, 26 Apr 2015 12:54:02 +0000 (21:54 +0900)]
Update translations
--HG--
branch : stable
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
sdottaka [Sun, 26 Apr 2015 12:12:45 +0000 (21:12 +0900)]
MDITabBar.cpp: Fix for High Contrast Themes
--HG--
branch : stable
sdottaka [Sat, 25 Apr 2015 14:59:58 +0000 (23:59 +0900)]
LineFiltersList.cpp: Ignore empty line filter
--HG--
branch : stable
sdottaka [Sat, 25 Apr 2015 14:52:51 +0000 (23:52 +0900)]
FilepathEdit.*: Adjust top margin in edit control
--HG--
branch : stable
sdottaka [Sat, 25 Apr 2015 13:56:06 +0000 (22:56 +0900)]
OpenView.*: Handle Ctrl+A key
--HG--
branch : stable
sdottaka [Sat, 25 Apr 2015 13:47:15 +0000 (22:47 +0900)]
MDITabBar: Make tab bar flat
--HG--
branch : stable
sdottaka [Sun, 19 Apr 2015 14:13:25 +0000 (23:13 +0900)]
Bump revision to 2.14.0+-jp-79
--HG--
branch : stable
sdottaka [Sun, 19 Apr 2015 14:00:10 +0000 (23:00 +0900)]
Update translations
--HG--
branch : stable
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
sdottaka [Sun, 19 Apr 2015 11:11:07 +0000 (20:11 +0900)]
Fix crash when recomparing selected folders non-recursively
--HG--
branch : stable
sdottaka [Sun, 19 Apr 2015 11:00:17 +0000 (20:00 +0900)]
CompareStats.cpp: Fix mixed eol-style
--HG--
branch : stable
sdottaka [Sun, 19 Apr 2015 10:59:49 +0000 (19:59 +0900)]
Remove "Enable multiple compare windows" group box
--HG--
branch : stable
sdottaka [Sun, 19 Apr 2015 09:39:20 +0000 (18:39 +0900)]
DirCompProgressBar: Show relative path instead of absolute path while comparing files
--HG--
branch : stable
sdottaka [Sat, 18 Apr 2015 13:05:33 +0000 (22:05 +0900)]
Diff3.h: Fix mixed eol-style
--HG--
branch : stable
sdottaka [Sat, 18 Apr 2015 13:04:59 +0000 (22:04 +0900)]
diffutils: Remove unused regex library
--HG--
branch : stable
sdottaka [Sat, 18 Apr 2015 08:11:29 +0000 (17:11 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sat, 18 Apr 2015 08:08:06 +0000 (17:08 +0900)]
Merge from
https://bitbucket.org/jtuc/winmerge2011/commits/
384fa7e51f4e7a0dc424fd67da34c2810e3649fd
(DirCompProgressDlg: Show paths of files being compared (lazily updated))
https://bitbucket.org/jtuc/winmerge2011/commits/
86a84dc5dec8b4c94e65cca7431f7ad10c5528ad
(DirCompProgressDlg: Show paths of most time-consuming one among current items)
--HG--
branch : stable
sdottaka [Sun, 12 Apr 2015 09:49:44 +0000 (18:49 +0900)]
BCMenu: Remove xp_draw_3D_bitmaps
--HG--
branch : stable
sdottaka [Sun, 12 Apr 2015 09:23:13 +0000 (18:23 +0900)]
Remove old VS version support
--HG--
branch : stable
sdottaka [Sun, 5 Apr 2015 12:03:10 +0000 (21:03 +0900)]
Bump revision to 2.14.0+-jp-78
--HG--
branch : stable
sdottaka [Sat, 4 Apr 2015 14:15:16 +0000 (23:15 +0900)]
ConfigLog.cpp: Show the version of hekseditU.dll, WinIMergeLib.dll and 7z.dll
--HG--
branch : stable
sdottaka [Sat, 4 Apr 2015 13:09:31 +0000 (22:09 +0900)]
update sevenzip to changeset 7:
39183f27c635
--HG--
branch : stable
sdottaka [Sat, 4 Apr 2015 02:34:30 +0000 (11:34 +0900)]
Merge.rc: Fine-tune the position of controls in dialogs (2)
--HG--
branch : stable
sdottaka [Sat, 4 Apr 2015 01:39:03 +0000 (10:39 +0900)]
Fix crash when searching with invalid regular expression
--HG--
branch : stable
sdottaka [Sat, 4 Apr 2015 01:36:34 +0000 (10:36 +0900)]
Use more appropriate font
--HG--
branch : stable
sdottaka [Sun, 29 Mar 2015 11:01:58 +0000 (20:01 +0900)]
Added tag 2.14.0+-jp-77 for changeset
6372ed162d8d
--HG--
branch : stable
sdottaka [Sun, 29 Mar 2015 10:03:15 +0000 (19:03 +0900)]
Bump revsion to 2.14.0+-jp-77
--HG--
branch : stable
sdottaka [Sun, 29 Mar 2015 10:01:23 +0000 (19:01 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 29 Mar 2015 09:09:44 +0000 (18:09 +0900)]
Fix menu items are displayed with wrong width sometimes
--HG--
branch : stable
sdottaka [Sun, 29 Mar 2015 07:19:02 +0000 (16:19 +0900)]
Fix disappeared tooltips on toolbar icons
--HG--
branch : stable
sdottaka [Sun, 29 Mar 2015 03:24:22 +0000 (12:24 +0900)]
Rename ID_* to IDS_* for String ID
--HG--
branch : stable
sdottaka [Sun, 29 Mar 2015 01:37:57 +0000 (10:37 +0900)]
Add more words to StringBlacklist.txt to reduce .po file size
--HG--
branch : stable
sdottaka [Sat, 28 Mar 2015 23:49:23 +0000 (08:49 +0900)]
Remove [Help/Release Notes] and [Help/Translations] menu item
--HG--
branch : stable
sdottaka [Sat, 28 Mar 2015 15:15:40 +0000 (00:15 +0900)]
Add language names to StringBlacklist.txt to reduce .po file size
--HG--
branch : stable
sdottaka [Sat, 28 Mar 2015 14:46:14 +0000 (23:46 +0900)]
Use WinMerge2011's MakeShortSize() function
--HG--
branch : stable
sdottaka [Sat, 28 Mar 2015 14:19:20 +0000 (23:19 +0900)]
Remove unused resource strings
--HG--
branch : stable
sdottaka [Sat, 28 Mar 2015 13:49:33 +0000 (22:49 +0900)]
Merge.rc: Replace tabs with spaces
--HG--
branch : stable
sdottaka [Sat, 28 Mar 2015 13:41:07 +0000 (22:41 +0900)]
Remove messages on the status bar to reduce the size of .rc file
--HG--
branch : stable
sdottaka [Sat, 28 Mar 2015 04:59:08 +0000 (13:59 +0900)]
Fix mixed eol-style
--HG--
branch : stable
sdottaka [Thu, 26 Mar 2015 14:27:07 +0000 (23:27 +0900)]
BCMenu.cpp: Draw menu items in XP-style even on Win8, Win7 and Vista
--HG--
branch : stable
sdottaka [Sun, 22 Mar 2015 11:24:04 +0000 (20:24 +0900)]
Bump revision to 2.14.0+-jp-76
--HG--
branch : stable
sdottaka [Sun, 22 Mar 2015 11:23:22 +0000 (20:23 +0900)]
CrystalEdit: Fix crash when closing editor window without closing Find dialog
--HG--
branch : stable
sdottaka [Sun, 22 Mar 2015 10:39:24 +0000 (19:39 +0900)]
Merge.rc: Fine-tune the position of controls in dialogs
--HG--
branch : stable
sdottaka [Sun, 22 Mar 2015 09:07:39 +0000 (18:07 +0900)]
Use appropriate system UI font for dialogs (Use Segoe UI font)
--HG--
branch : stable
sdottaka [Sat, 21 Mar 2015 14:41:43 +0000 (23:41 +0900)]
MessageBoxDialog.*: Simulate Vista-style message box
--HG--
branch : stable
sdottaka [Sat, 21 Mar 2015 07:49:38 +0000 (16:49 +0900)]
Update Translations
--HG--
branch : stable
sdottaka [Sat, 21 Mar 2015 07:13:53 +0000 (16:13 +0900)]
Add [Check For Updates] menu item
--HG--
branch : stable
sdottaka [Sun, 15 Mar 2015 08:20:12 +0000 (17:20 +0900)]
OptionsMgr.h: Add GetDefault() template function
--HG--
branch : stable
sdottaka [Sat, 14 Mar 2015 13:59:39 +0000 (22:59 +0900)]
Src/Merge.vcxproj: Add Constans.h
--HG--
branch : stable
sdottaka [Sat, 14 Mar 2015 13:58:49 +0000 (22:58 +0900)]
Installer/InnoSetup/WinMerge*.iss: Install GPL.rtf
--HG--
branch : stable
sdottaka [Sat, 14 Mar 2015 13:15:16 +0000 (22:15 +0900)]
Remove unused variable
--HG--
branch : 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 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: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: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 [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 05:16:40 +0000 (14:16 +0900)]
Add "Debug Unicode + Code Analysis" configuration
--HG--
branch : stable
OSDN Git Service
