OSDN Git Service
sdottaka [Sun, 19 May 2013 14:12:03 +0000 (23:12 +0900)]
Move drag and drop helper code to DragDrop.*
sdottaka [Sun, 19 May 2013 13:50:26 +0000 (22:50 +0900)]
Move loading/saving diff color settings code to OptionsDiffColors.{cpp,h} (2)
sdottaka [Wed, 15 May 2013 14:23:52 +0000 (23:23 +0900)]
Added tag 2.14.0+-jp-7 for changeset
0e72022c2be8
sdottaka [Wed, 15 May 2013 13:25:22 +0000 (22:25 +0900)]
Update revisions
sdottaka [Wed, 15 May 2013 13:25:10 +0000 (22:25 +0900)]
stringdiffs.*: Remove unused functions
sdottaka [Tue, 14 May 2013 13:25:26 +0000 (22:25 +0900)]
Fix adding FFILEOPEN_NOMRU flagged items to Win7 jump list
sdottaka [Mon, 13 May 2013 16:04:44 +0000 (01:04 +0900)]
Fix adding garbage item into Win7 jump list on WinMerge ANSI build
sdottaka [Mon, 13 May 2013 13:53:10 +0000 (22:53 +0900)]
Get rid of a NUL char at the end of pasted text on ANSI build
sdottaka [Mon, 13 May 2013 13:40:01 +0000 (22:40 +0900)]
Move loading/saving diff color settings code to OptionsDiffColors.{cpp,h}
sdottaka [Sun, 12 May 2013 12:36:41 +0000 (21:36 +0900)]
Fix mixed eol-style
sdottaka [Sun, 12 May 2013 03:42:25 +0000 (12:42 +0900)]
Rename SyntaxColorsUtil.* to OptionsSyntaxColors.*
sdottaka [Sun, 12 May 2013 02:58:12 +0000 (11:58 +0900)]
* Remove "View/Select Font" menu item. close #19
* Update File/Folder Window's font when selecting "View/Use Default Font" menu item
* Move loading/saving font settings code to OptionsFont.{cpp,h}
sdottaka [Sun, 5 May 2013 06:22:59 +0000 (15:22 +0900)]
Separte diff3 algorithm from DiffWrapper.cpp and stringdiffs.cpp into Diff3.h
sdottaka [Sun, 5 May 2013 02:20:43 +0000 (11:20 +0900)]
Fix mixed eol-style
sdottaka [Sat, 4 May 2013 04:40:42 +0000 (13:40 +0900)]
Fix crash when comparing zero size file with prediffer plugin
sdottaka [Sat, 4 May 2013 03:55:45 +0000 (12:55 +0900)]
Avoid using 'delete' operator
sdottaka [Fri, 3 May 2013 09:06:20 +0000 (18:06 +0900)]
Update boost version to 1.53.0
sdottaka [Fri, 3 May 2013 03:55:35 +0000 (12:55 +0900)]
Fix mixed eol-style
sdottaka [Mon, 29 Apr 2013 10:00:07 +0000 (19:00 +0900)]
Fix: Still shows green progress bar on Win7's taskbar even when finished comparing folders. Submitted by tatsu-san
sdottaka [Sun, 21 Apr 2013 20:01:37 +0000 (05:01 +0900)]
Added tag 2.14.0+-jp-6 for changeset
d8ee64c8d443
sdottaka [Sun, 21 Apr 2013 13:48:54 +0000 (22:48 +0900)]
Cppcheck: Variable 'm_svalue' is assigned in constructor body. Consider performing initialization in initialization list.
sdottaka [Sun, 21 Apr 2013 13:41:35 +0000 (22:41 +0900)]
Cppcheck: Function parameter 'str1' should be passed by reference.
sdottaka [Sun, 21 Apr 2013 13:37:23 +0000 (22:37 +0900)]
Cppcheck: Passing the result of c_str() to a function that takes std::string as argument no. ? is slow and redundant.
sdottaka [Sun, 21 Apr 2013 13:32:39 +0000 (22:32 +0900)]
Cppcheck: The extra qualification '*::' is unnecessary and is considered an error by many compilers.
sdottaka [Sun, 21 Apr 2013 13:27:30 +0000 (22:27 +0900)]
Cppcheck: Member variable * is not initialized in the constructor.
sdottaka [Sun, 21 Apr 2013 13:08:35 +0000 (22:08 +0900)]
Cppcheck: syntax error
sdottaka [Sun, 21 Apr 2013 12:53:30 +0000 (21:53 +0900)]
Cppcheck: Common realloc mistake: 'ptr' nulled but not freed upon failure
sdottaka [Sun, 21 Apr 2013 12:36:54 +0000 (21:36 +0900)]
Cppcheck: Uninitialized variable: bModified
sdottaka [Sun, 21 Apr 2013 12:35:14 +0000 (21:35 +0900)]
Fix: OpenView does not accept Drag&Droped three files
sdottaka [Sun, 21 Apr 2013 12:30:27 +0000 (21:30 +0900)]
Fix memory leak In GetWordDiffArray()
sdottaka [Sun, 21 Apr 2013 11:48:04 +0000 (20:48 +0900)]
Cppcheck: Passing the result of c_str() to a function that takes std::string as argument no. ? is slow and redundant.
sdottaka [Sun, 21 Apr 2013 11:36:04 +0000 (20:36 +0900)]
Cppcheck: Unused variable: *
Cppcheck: Variable * is assigned a value that is never used.
sdottaka [Sun, 21 Apr 2013 11:03:22 +0000 (20:03 +0900)]
Cppcheck: Prefer prefix ++/-- operators for non-primitive types.
sdottaka [Sun, 21 Apr 2013 08:32:25 +0000 (17:32 +0900)]
Fix crash when enabling Application Verifier
sdottaka [Sun, 21 Apr 2013 05:31:46 +0000 (14:31 +0900)]
Update revisions
sdottaka [Sun, 21 Apr 2013 05:31:35 +0000 (14:31 +0900)]
Fix: Temporary folder path name is created in Windows 7 jump list after comparing zip files
sdottaka [Sun, 21 Apr 2013 05:26:31 +0000 (14:26 +0900)]
Change "FileDescription" of WinMergeU.exe
sdottaka [Sun, 21 Apr 2013 05:22:47 +0000 (14:22 +0900)]
Fix: Windows 7 Jump List not appearing on Start Menu
sdottaka [Wed, 17 Apr 2013 14:18:19 +0000 (23:18 +0900)]
Added tag 2.14.0+-jp-5 for changeset
c6c1df8f5366
sdottaka [Wed, 17 Apr 2013 14:18:17 +0000 (23:18 +0900)]
Removed tag 2.14.0+-jp-5
sdottaka [Wed, 17 Apr 2013 14:17:49 +0000 (23:17 +0900)]
Remove atl100.dll dependency from WinMerge32BitPluginProxy.exe
sdottaka [Mon, 15 Apr 2013 14:14:09 +0000 (23:14 +0900)]
Added tag 2.14.0+-jp-5 for changeset
105e944f738b
sdottaka [Mon, 15 Apr 2013 10:57:38 +0000 (19:57 +0900)]
no more need to adjust image size from rev.7987
sdottaka [Mon, 15 Apr 2013 10:38:49 +0000 (19:38 +0900)]
Fix for the case when there is '&' in Project File
sdottaka [Mon, 15 Apr 2013 10:22:16 +0000 (19:22 +0900)]
Add support for Windows 7 jump list
sdottaka [Mon, 15 Apr 2013 08:21:46 +0000 (17:21 +0900)]
Make PLUGIN_AUTO default selection in CSelectUnpackerDlg.
sdottaka [Mon, 15 Apr 2013 07:10:03 +0000 (16:10 +0900)]
Removed tag 2.14.0+-jp-5
sdottaka [Sat, 13 Apr 2013 13:38:04 +0000 (22:38 +0900)]
Change the behavior when specifying '-e' command line option.
(Quit WinMerge with ESC key when opening only one window) issue #17
sdottaka [Fri, 12 Apr 2013 14:53:05 +0000 (23:53 +0900)]
Fix: failed to delete temporary folder on XP
sdottaka [Sun, 7 Apr 2013 00:23:37 +0000 (09:23 +0900)]
Added tag 2.14.0+-jp-5 for changeset
06871e7c92d9
sdottaka [Sat, 6 Apr 2013 13:37:27 +0000 (22:37 +0900)]
Defer deleting temporary files. issue #18
sdottaka [Sat, 6 Apr 2013 13:21:24 +0000 (22:21 +0900)]
Separate ShellExtension project from WinMerge_vc10.sln
sdottaka [Sat, 6 Apr 2013 13:18:11 +0000 (22:18 +0900)]
Update revisions
sdottaka [Sat, 6 Apr 2013 13:17:07 +0000 (22:17 +0900)]
Add 32bit plugin proxy COM server
sdottaka [Sat, 16 Mar 2013 22:52:08 +0000 (07:52 +0900)]
Added tag 2.14.0+-jp-4 for changeset
4e61445d642d
sdottaka [Sat, 16 Mar 2013 22:51:05 +0000 (07:51 +0900)]
Update revisions
sdottaka [Sat, 16 Mar 2013 22:49:38 +0000 (07:49 +0900)]
Fix crash when using shift key drag and drop
sdottaka [Sat, 16 Mar 2013 22:46:38 +0000 (07:46 +0900)]
Fix import/export WinMerge.reg error. close #16
sdottaka [Sat, 16 Mar 2013 22:38:55 +0000 (07:38 +0900)]
Enable right button drag and drop
sdottaka [Mon, 4 Mar 2013 11:40:15 +0000 (20:40 +0900)]
Added tag 2.14.0+-jp-3 for changeset
467ccf561df7
sdottaka [Sun, 3 Mar 2013 15:46:53 +0000 (00:46 +0900)]
Update revisions
sdottaka [Sun, 3 Mar 2013 15:46:38 +0000 (00:46 +0900)]
* Fix unexpected result when comparing utf-8 files with prediffer plugin
* Fix "Unable to compare files" error when comparing zero-byte files.
sdottaka [Sun, 3 Mar 2013 15:25:47 +0000 (00:25 +0900)]
Fix misdetection of same binary files as different files when 'Custom codepage' = UTF-8 and using mlang.dll
sdottaka [Sun, 3 Mar 2013 15:05:20 +0000 (00:05 +0900)]
* Revert rev.7738. Instead, Copy file paths separated by a space to clipboard when clicking "Copy Items To Clipboard" menu item
* Add "Copy Items To Clipbard/Both" menu item
* Remove compiler warnings
sdottaka [Sun, 3 Mar 2013 14:39:58 +0000 (23:39 +0900)]
Fix file change detection failure
sdottaka [Sun, 3 Mar 2013 14:27:31 +0000 (23:27 +0900)]
Fix that WinMerge sometimes reported wrong results in Quick Contents Compare Mode(2)
sdottaka [Sun, 3 Mar 2013 14:23:58 +0000 (23:23 +0900)]
Detect Windows 8 and Windows Server 2012 in config log
sdottaka [Sun, 3 Mar 2013 14:22:36 +0000 (23:22 +0900)]
* Add ucr::getBomSize()
* Add support for UCS2{LE|BE} convertion to ucr::CrossConvert()
sdottaka [Mon, 18 Feb 2013 08:04:15 +0000 (00:04 -0800)]
Added tag 2.14.0+-jp-2 for changeset
7277b94a33bf
sdottaka [Mon, 18 Feb 2013 08:02:42 +0000 (00:02 -0800)]
Compare words per line if diff block lines > 20 (for performance improvement and better result)
sdottaka [Mon, 18 Feb 2013 07:40:00 +0000 (23:40 -0800)]
Fix that WinMerge sometimes reported wrong results in Quick Contents Compare Mode
Conditions:
* Compare Method == 'Quick Contents'
* Check "Ignore carriage return differences"
* File size > 32KB
* Same contents but different EOLs
sdottaka [Mon, 18 Feb 2013 07:19:23 +0000 (23:19 -0800)]
Update revisions
sdottaka [Mon, 18 Feb 2013 07:19:04 +0000 (23:19 -0800)]
Change URL
sdottaka [Mon, 18 Feb 2013 07:17:46 +0000 (23:17 -0800)]
Update Japanese translation for Inno Setup
sdottaka [Tue, 12 Feb 2013 07:59:17 +0000 (23:59 -0800)]
Added tag 2.14.0+-jp-1 for changeset
db532de010e5
sdottaka [Tue, 12 Feb 2013 07:58:34 +0000 (23:58 -0800)]
Make a folder compare report with color
sdottaka [Tue, 12 Feb 2013 04:11:54 +0000 (20:11 -0800)]
Fix uninitialized variable
sdottaka [Tue, 12 Feb 2013 04:08:00 +0000 (20:08 -0800)]
Fix window menu breaking when closing OpenView window
sdottaka [Tue, 12 Feb 2013 03:58:01 +0000 (19:58 -0800)]
Avoid conflicting folder name in TEMP folder
sdottaka [Tue, 12 Feb 2013 03:49:28 +0000 (19:49 -0800)]
Change default maximized window
sdottaka [Tue, 12 Feb 2013 03:41:10 +0000 (19:41 -0800)]
Update revisions
sdottaka [Tue, 12 Feb 2013 03:40:20 +0000 (19:40 -0800)]
Add .hgignore file
sdottaka [Tue, 12 Feb 2013 03:10:22 +0000 (19:10 -0800)]
Fix broken moved blocks detection feature
sdottaka [Tue, 12 Feb 2013 03:02:30 +0000 (19:02 -0800)]
Add SortAscending, SortDescending and ExecFilterCommand to editor addin.sct
sdottaka [Tue, 12 Feb 2013 02:53:12 +0000 (18:53 -0800)]
Drop support for Win98/ME/2000
sdottaka [Tue, 12 Feb 2013 02:49:12 +0000 (18:49 -0800)]
Merge from SVN trunk
sdottaka [Mon, 4 Feb 2013 08:24:38 +0000 (00:24 -0800)]
Added tag 2.13.22+-jp-2 for changeset
02407cebb2e7
sdottaka [Mon, 4 Feb 2013 08:24:16 +0000 (00:24 -0800)]
Added tag 2.13.22+-jp-1 for changeset
0173c3420011
sdottaka [Mon, 4 Feb 2013 08:23:45 +0000 (00:23 -0800)]
Removed tag 2.13.22+-jp-2
sdottaka [Mon, 4 Feb 2013 08:22:10 +0000 (00:22 -0800)]
Added tag 2.13.22+-jp-2 for changeset
667dbdd0068b
sdottaka [Mon, 4 Feb 2013 08:21:28 +0000 (00:21 -0800)]
Update revisions
sdottaka [Mon, 4 Feb 2013 08:21:08 +0000 (00:21 -0800)]
Include Translations folder in source archive
sdottaka [Mon, 4 Feb 2013 08:15:29 +0000 (00:15 -0800)]
* Change DirCompProgressDlg dialog to DirCompProgressBar dialog bar
* Allow to open new files when comparing folders
sdottaka [Mon, 4 Feb 2013 07:35:50 +0000 (23:35 -0800)]
Fix error when opening zero byte file
sdottaka [Mon, 4 Feb 2013 07:33:35 +0000 (23:33 -0800)]
Display file timestamp as not UTC but local time
sdottaka [Mon, 4 Feb 2013 07:21:40 +0000 (23:21 -0800)]
Fix warning "dialog data checkbox value (-
842150451) out of range"
sdottaka [Mon, 4 Feb 2013 07:19:22 +0000 (23:19 -0800)]
Fix runtime error "string iterator not dereferencable"
sdottaka [Mon, 4 Feb 2013 07:11:40 +0000 (23:11 -0800)]
Remove compiler warning
sdottaka [Mon, 4 Feb 2013 07:10:14 +0000 (23:10 -0800)]
Fix mixed eol-style
sdottaka [Mon, 4 Feb 2013 07:04:57 +0000 (23:04 -0800)]
* Make ShellExtension icon background transparent on Vista or later
* Remove WinMergeParent bitmap