OSDN Git Service
sdottaka [Sun, 7 Jul 2013 05:19:52 +0000 (14:19 +0900)]
OptionsMgr: avoid unneccessary copying values
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 08:27:43 +0000 (17:27 +0900)]
Bump revision to 2.14.0+-jp-66
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 08:27:22 +0000 (17:27 +0900)]
OptionsDef.h: Rename Settings/CompMethod to Settings/CompMethod2
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 06:50:09 +0000 (15:50 +0900)]
TimeSizeCompare: Support 3-way compare
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 02:55:45 +0000 (11:55 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 02:47:15 +0000 (11:47 +0900)]
FolderCompare: Add Binary Contents compare method
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 02:45:51 +0000 (11:45 +0900)]
FolderCompare: Did not show items that have an error
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 02:38:28 +0000 (11:38 +0900)]
ImgMergeFrm.cpp: Fix mixed eol-style
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 02:37:46 +0000 (11:37 +0900)]
Update freeimage to changeset 4:
6e3572e0c245
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 02:37:09 +0000 (11:37 +0900)]
Update winimerge to changeset 66:
10c50c358bd4
--HG--
branch : stable
sdottaka [Mon, 29 Dec 2014 12:54:40 +0000 (21:54 +0900)]
Added tag 2.14.0+-jp-65 for changeset
95c3fc162f25
--HG--
branch : stable
sdottaka [Mon, 29 Dec 2014 12:52:39 +0000 (21:52 +0900)]
Bump revision to 2.14.0+-jp-65
--HG--
branch : stable
sdottaka [Mon, 29 Dec 2014 12:50:56 +0000 (21:50 +0900)]
ImageDiff: Make comparing position adjustable by Shift+Arrow keys
--HG--
branch : stable
sdottaka [Sat, 27 Dec 2014 13:17:55 +0000 (22:17 +0900)]
3-way Folder Compare: Fix treating different binary files as the same files
--HG--
branch : stable
sdottaka [Sat, 27 Dec 2014 11:51:52 +0000 (20:51 +0900)]
Fix crash when replacing the end of text
--HG--
branch : stable
sdottaka [Sat, 27 Dec 2014 11:48:53 +0000 (20:48 +0900)]
Fix that 'Match whole word only' in Replace dialog didn't work properly
e.g.
Find what: L
Replace with: R
Match whole word only: checked
NULL -> NULR
--HG--
branch : stable
sdottaka [Sat, 27 Dec 2014 11:25:14 +0000 (20:25 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sat, 27 Dec 2014 11:21:43 +0000 (20:21 +0900)]
Move splash screen image to About dialog and remove splash screen
--HG--
branch : stable
sdottaka [Thu, 18 Dec 2014 13:56:35 +0000 (22:56 +0900)]
Bump revision to 2.14.0+-jp-64
--HG--
branch : stable
sdottaka [Thu, 18 Dec 2014 13:28:01 +0000 (22:28 +0900)]
HexMergeView.cpp: Fix crash when scrolling horizontally in the HexView
--HG--
branch : stable
sdottaka [Sat, 29 Nov 2014 12:29:55 +0000 (21:29 +0900)]
Added tag 2.14.0+-jp-63 for changeset
4baac03bf014
--HG--
branch : stable
sdottaka [Sat, 29 Nov 2014 12:29:53 +0000 (21:29 +0900)]
Removed tag 2.14.0+-jp-63
--HG--
branch : stable
sdottaka [Sat, 29 Nov 2014 12:29:10 +0000 (21:29 +0900)]
Update winimerge to changeset 54:
f4220d068465
--HG--
branch : stable
sdottaka [Sat, 29 Nov 2014 10:47:50 +0000 (19:47 +0900)]
BuildBin.cmd: Replace WinMerge_vc10.sln with WinMerge.sln
--HG--
branch : stable
sdottaka [Sat, 29 Nov 2014 08:43:20 +0000 (17:43 +0900)]
Added tag 2.14.0+-jp-63 for changeset
773fc856e383
--HG--
branch : stable
sdottaka [Sat, 29 Nov 2014 08:37:34 +0000 (17:37 +0900)]
TimeSizeCompare.cpp: Remove an invalid line
--HG--
branch : stable
sdottaka [Sat, 29 Nov 2014 08:02:55 +0000 (17:02 +0900)]
Reduce compiler warnings
--HG--
branch : stable
sdottaka [Sat, 29 Nov 2014 04:56:42 +0000 (13:56 +0900)]
Merge*.ico: Compress file size by IcoFX and remove 128x128 image
--HG--
branch : stable
sdottaka [Sat, 29 Nov 2014 04:29:26 +0000 (13:29 +0900)]
Rename WinMerge_vc10.sln to WinMerge.sln
--HG--
branch : stable
sdottaka [Sat, 29 Nov 2014 04:09:47 +0000 (13:09 +0900)]
Use std::int64_t instead of Poco::Int64
--HG--
branch : stable
sdottaka [Sat, 29 Nov 2014 02:23:07 +0000 (11:23 +0900)]
Plugins.cpp: Fix crash when running UnitTests
--HG--
branch : stable
sdottaka [Sat, 29 Nov 2014 02:22:19 +0000 (11:22 +0900)]
Add google test to Externals folder
--HG--
branch : stable
sdottaka [Sat, 29 Nov 2014 01:06:48 +0000 (10:06 +0900)]
Poco: Enable optimization
--HG--
branch : stable
sdottaka [Fri, 28 Nov 2014 14:32:26 +0000 (23:32 +0900)]
Rename ToolbarDummy.bmp to ToolbarEnabled8bit.bmp
--HG--
branch : stable
sdottaka [Fri, 28 Nov 2014 14:10:57 +0000 (23:10 +0900)]
ToolbarDummy.bmp: monochrome toolbar to 8bit color toolbar
--HG--
branch : stable
sdottaka [Fri, 28 Nov 2014 12:36:29 +0000 (21:36 +0900)]
Update google test version to 1.7
--HG--
branch : stable
sdottaka [Fri, 28 Nov 2014 12:32:46 +0000 (21:32 +0900)]
MergeDoc.cpp: Use std::swap instead of boost::swap
--HG--
branch : stable
sdottaka [Fri, 28 Nov 2014 12:29:52 +0000 (21:29 +0900)]
Use std::unique_ptr/shared_ptr instead of boost::scoped_ptr/scoped_array/shared_ptr
--HG--
branch : stable
sdottaka [Fri, 28 Nov 2014 11:19:13 +0000 (20:19 +0900)]
Remove VC7.1 project files
--HG--
branch : stable
sdottaka [Fri, 28 Nov 2014 10:24:53 +0000 (19:24 +0900)]
StdAfx.h: Reduce compiler warnings
--HG--
branch : stable
sdottaka [Thu, 27 Nov 2014 07:26:03 +0000 (16:26 +0900)]
Use <=8bit toolbar bitmap to avoid an assertion on VS2013 debug build
--HG--
branch : stable
sdottaka [Wed, 26 Nov 2014 13:59:38 +0000 (22:59 +0900)]
boost/core/addressof.hpp: Forgot to add the file
--HG--
branch : stable
sdottaka [Wed, 26 Nov 2014 13:53:04 +0000 (22:53 +0900)]
Update revision to 2.14.0+-jp-63
--HG--
branch : stable
sdottaka [Wed, 26 Nov 2014 13:50:50 +0000 (22:50 +0900)]
Merge.vcxproj: Reduce executable size
--HG--
branch : stable
sdottaka [Wed, 26 Nov 2014 12:40:06 +0000 (21:40 +0900)]
Update project files to Visual Studio 2013
--HG--
branch : stable
sdottaka [Wed, 26 Nov 2014 05:54:43 +0000 (14:54 +0900)]
Update boost version to 1.57
--HG--
branch : stable
sdottaka [Wed, 26 Nov 2014 04:16:57 +0000 (13:16 +0900)]
Clean up project files
--HG--
branch : stable
sdottaka [Wed, 26 Nov 2014 04:08:09 +0000 (13:08 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Wed, 26 Nov 2014 04:05:09 +0000 (13:05 +0900)]
Fix conflicting menu accelerator
--HG--
branch : stable
sdottaka [Sat, 15 Nov 2014 01:46:03 +0000 (10:46 +0900)]
Bump revision to 2.14.0+-jp-62
--HG--
branch : stable
sdottaka [Sat, 15 Nov 2014 01:43:31 +0000 (10:43 +0900)]
Fix crash when comparing files with following conditions:
- file encoding is utf-8
- add a syncpoint to the first line in one side and to not the first line in other side
Don't include BOM in files for diff. close #35
--HG--
branch : stable
sdottaka [Fri, 14 Nov 2014 10:47:33 +0000 (19:47 +0900)]
Add #include <algorighm> for VS2013
--HG--
branch : stable
sdottaka [Tue, 11 Nov 2014 16:27:28 +0000 (01:27 +0900)]
Bump revision to 2.14.0+-jp-61
--HG--
branch : stable
sdottaka [Mon, 10 Nov 2014 13:07:28 +0000 (22:07 +0900)]
CompareMSWordFiles.sct: Show which setting items are slow
--HG--
branch : stable
sdottaka [Mon, 10 Nov 2014 13:07:10 +0000 (22:07 +0900)]
CompareMSExcelFiles.sct: * Handle an error when converting a sheet to image
* Show which setting items are slow
--HG--
branch : stable
sdottaka [Mon, 10 Nov 2014 05:29:48 +0000 (14:29 +0900)]
CompareMS*.sct: Select proper language item in 'Language' combobox
--HG--
branch : stable
sdottaka [Mon, 10 Nov 2014 03:46:18 +0000 (12:46 +0900)]
OpenView.cpp: Fix crash when getting WM_USER message from an unknown sender
--HG--
branch : stable
sdottaka [Sun, 9 Nov 2014 23:31:03 +0000 (08:31 +0900)]
Bump revision to 2.14.0+-jp-60
--HG--
branch : stable
sdottaka [Sun, 9 Nov 2014 23:22:35 +0000 (08:22 +0900)]
CompareMS*Files.sct: * Make these configurable
* Implement IsFolder(), UnpackFolder() method
--HG--
branch : stable
sdottaka [Sun, 9 Nov 2014 11:52:42 +0000 (20:52 +0900)]
Update plugin dlls
--HG--
branch : stable
sdottaka [Sun, 9 Nov 2014 11:52:02 +0000 (20:52 +0900)]
Remove following plugins that are not exist in x86 version:
DisplayBinaryFiles.dll EditBinaryFiles.dll HideFirstLetter.dll
--HG--
branch : stable
sdottaka [Sun, 9 Nov 2014 11:47:54 +0000 (20:47 +0900)]
Replace CompareMS*.dll plugins with CompareMS*.sct plugins
--HG--
branch : stable
sdottaka [Sat, 8 Nov 2014 02:25:26 +0000 (11:25 +0900)]
* Introduce new plugin type FILE_FOLDER_PACK_UNPACKER
* Use FILE_FOLDER_PACK_UNPACKER plugin for decompressing archives
--HG--
branch : stable
sdottaka [Sat, 8 Nov 2014 01:48:52 +0000 (10:48 +0900)]
Update .hgignore
--HG--
branch : stable
sdottaka [Fri, 7 Nov 2014 22:56:53 +0000 (07:56 +0900)]
Use <algorithm> function templates
--HG--
branch : stable
sdottaka [Thu, 6 Nov 2014 14:24:53 +0000 (23:24 +0900)]
Add overloaded functions: FileTransform_Unpacking(), FileTransform_Prediffing()
--HG--
branch : stable
sdottaka [Thu, 6 Nov 2014 14:19:24 +0000 (23:19 +0900)]
ImgMergeFrm.cpp: Use string_join()
--HG--
branch : stable
sdottaka [Mon, 26 Aug 2013 15:15:32 +0000 (00:15 +0900)]
Rename String_join() to string_join()
--HG--
branch : stable
sdottaka [Mon, 26 Aug 2013 12:42:52 +0000 (21:42 +0900)]
Use String_join()
--HG--
branch : stable
sdottaka [Sun, 18 Aug 2013 16:08:20 +0000 (01:08 +0900)]
The iterator of PathContext class seems to work
--HG--
branch : stable
sdottaka [Sun, 18 Aug 2013 15:48:57 +0000 (00:48 +0900)]
Add iterator for PathContext class
--HG--
branch : stable
sdottaka [Sun, 18 Aug 2013 15:44:05 +0000 (00:44 +0900)]
Add String_join() function template
--HG--
branch : stable
sdottaka [Thu, 6 Nov 2014 02:00:24 +0000 (11:00 +0900)]
DirView.cpp: Remove unused function
--HG--
branch : stable
sdottaka [Wed, 5 Nov 2014 07:15:54 +0000 (16:15 +0900)]
Add CScriptsOfThread::GetAutomaticPluginByFilter() function
--HG--
branch : stable
sdottaka [Wed, 5 Nov 2014 05:45:52 +0000 (14:45 +0900)]
Remove FileTransform.h dependency from Plugins.cpp
(Move the global variable 'TransformationCategories' in FileTransform.* to Plugins.*)
--HG--
branch : stable
sdottaka [Wed, 5 Nov 2014 01:22:46 +0000 (10:22 +0900)]
* Remove MergeDoc.h and HexMergeDoc.h dependency from DirDoc.* and DirView.cpp
(Introduce IMergeDoc interface)
* Fix crash when closing a DirFrame window without closing the related ImgMergeFrame windows
--HG--
branch : stable
sdottaka [Mon, 3 Nov 2014 23:35:35 +0000 (08:35 +0900)]
lwdisp.c: Show a better error message when occurring an error of plugins
--HG--
branch : stable
sdottaka [Mon, 3 Nov 2014 23:29:08 +0000 (08:29 +0900)]
Add Plugins/src_VB/VBPlugins.vbg
--HG--
branch : stable
sdottaka [Mon, 3 Nov 2014 23:28:20 +0000 (08:28 +0900)]
Plugins: Add ShowSettingsDialog() method to plugins
--HG--
branch : stable
sdottaka [Mon, 3 Nov 2014 12:11:05 +0000 (21:11 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Mon, 3 Nov 2014 12:08:33 +0000 (21:08 +0900)]
Plugin: Make plugins configurable (Add ShowSettingsDialog() method) close #14
--HG--
branch : stable
sdottaka [Mon, 3 Nov 2014 07:00:47 +0000 (16:00 +0900)]
Plugins/src_VCPP/IngoreFieldsTab/typeinfoex.h: Fix a compiler warning
--HG--
branch : stable
sdottaka [Mon, 3 Nov 2014 06:56:16 +0000 (15:56 +0900)]
Plugins: Fix Unicode build
--HG--
branch : stable
sdottaka [Tue, 28 Oct 2014 16:08:01 +0000 (01:08 +0900)]
Added tag 2.14.0+-jp-59 for changeset
d7852e93d757
--HG--
branch : stable
sdottaka [Tue, 28 Oct 2014 13:28:16 +0000 (22:28 +0900)]
WinMerge*.iss: Always create MergePlugins folder even though not installing plugins
--HG--
branch : stable
sdottaka [Tue, 28 Oct 2014 12:42:52 +0000 (21:42 +0900)]
Bump revision to 2.14.0+-jp-59
--HG--
branch : stable
sdottaka [Tue, 28 Oct 2014 12:42:28 +0000 (21:42 +0900)]
Externals/winimerge: update winimerge to 0.9.6.0
--HG--
branch : stable
sdottaka [Tue, 28 Oct 2014 06:19:01 +0000 (15:19 +0900)]
MergeDoc.cpp: Reduce HTML report file size
--HG--
branch : stable
sdottaka [Tue, 28 Oct 2014 02:49:55 +0000 (11:49 +0900)]
Folder Compare Report: Include icons in HTML report
--HG--
branch : stable
sdottaka [Tue, 28 Oct 2014 02:35:14 +0000 (11:35 +0900)]
ImgMergeFrm.cpp: Chrome didn't display images in HTML report.
--HG--
branch : stable
sdottaka [Mon, 27 Oct 2014 03:04:49 +0000 (12:04 +0900)]
Externals/winimerge: update winimerge to 0.9.5.0
--HG--
branch : stable
sdottaka [Mon, 27 Oct 2014 03:01:05 +0000 (12:01 +0900)]
HTML Report: modernize html reports
--HG--
branch : stable
sdottaka [Mon, 27 Oct 2014 02:38:00 +0000 (11:38 +0900)]
Merge.cpp: Restore window before showing messagebox
--HG--
branch : stable
sdottaka [Mon, 27 Oct 2014 02:35:54 +0000 (11:35 +0900)]
DirView.cpp: Fix crash while creating folder compare report
--HG--
branch : stable
sdottaka [Mon, 27 Oct 2014 01:12:33 +0000 (10:12 +0900)]
ccrystaltextview.cpp: merge text blocks if possible to decrease html report size
--HG--
branch : stable
sdottaka [Sat, 25 Oct 2014 00:34:42 +0000 (09:34 +0900)]
Removed tag 2.13.13+-JP-11
--HG--
branch : stable
sdottaka [Tue, 21 Oct 2014 06:53:18 +0000 (15:53 +0900)]
.hgsub: Add subpaths magic described at (mercurial.selenic.com/wiki/Subrepository)
--HG--
branch : stable
sdottaka [Thu, 16 Oct 2014 13:29:27 +0000 (22:29 +0900)]
Bump revision to 2.14.0+-jp-58
--HG--
branch : stable
sdottaka [Thu, 16 Oct 2014 13:28:48 +0000 (22:28 +0900)]
DirView.cpp: Compare folders in a new tab when the Ctrl key is pressed
--HG--
branch : stable
sdottaka [Thu, 16 Oct 2014 13:19:29 +0000 (22:19 +0900)]
Merge.cpp: Restore main window after closing message box if main window is minimized
--HG--
branch : stable
OSDN Git Service
