OSDN Git Service
sdottaka [Sat, 29 Nov 2014 08:44:05 +0000 (17:44 +0900)]
Merge with 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:34:37 +0000 (17:34 +0900)]
Merge with 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 11:20:26 +0000 (20:20 +0900)]
Merge with stable
sdottaka [Thu, 27 Nov 2014 07:28:57 +0000 (16:28 +0900)]
Merge with stable
sdottaka [Thu, 27 Nov 2014 07:27:55 +0000 (16:27 +0900)]
Merge with 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:28:36 +0000 (01:28 +0900)]
Merge with 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 [Tue, 11 Nov 2014 13:09:45 +0000 (22:09 +0900)]
Revert .hgsub, .hgsubstate
sdottaka [Tue, 11 Nov 2014 12:53:56 +0000 (21:53 +0900)]
Add Externals/freeimage, frhed, winimerge
sdottaka [Tue, 11 Nov 2014 12:38:36 +0000 (21:38 +0900)]
Add .gitmodules
sdottaka [Tue, 11 Nov 2014 12:35:06 +0000 (21:35 +0900)]
Revert "Add .gitmodules"
This reverts commit
0e23f8846402984e15b8727ae5d390dc90fa841e.
sdottaka [Tue, 11 Nov 2014 12:18:25 +0000 (21:18 +0900)]
Add .gitmodules
sdottaka [Tue, 11 Nov 2014 06:31:56 +0000 (15:31 +0900)]
Merge with 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 [Thu, 30 Oct 2014 09:41:37 +0000 (18:41 +0900)]
Merge with 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:19:29 +0000 (12:19 +0900)]
Merge with 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:57:27 +0000 (15:57 +0900)]
Merge with 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
sdottaka [Sun, 5 Oct 2014 12:20:21 +0000 (21:20 +0900)]
Merge with stable
sdottaka [Sun, 5 Oct 2014 12:14:23 +0000 (21:14 +0900)]
Bump revision to 2.14.0+-jp-57
--HG--
branch : stable
sdottaka [Sun, 5 Oct 2014 11:50:15 +0000 (20:50 +0900)]
Apply the patch below:
[Fix for MFC 8.0 MDI Maximizing Child Window bug on Vista]
https://groups.google.com/forum/#!topic/microsoft.public.vc.mfc/iajCdW5DzTM
--HG--
branch : stable
sdottaka [Fri, 3 Oct 2014 01:08:20 +0000 (10:08 +0900)]
Update .hgsub
sdottaka [Fri, 3 Oct 2014 01:08:20 +0000 (10:08 +0900)]
Update .hgsub
--HG--
branch : stable
sdottaka [Fri, 3 Oct 2014 00:59:31 +0000 (09:59 +0900)]
Fix broken .hgsubstate
sdottaka [Thu, 2 Oct 2014 18:13:55 +0000 (03:13 +0900)]
Merge with stable
sdottaka [Thu, 2 Oct 2014 17:35:06 +0000 (02:35 +0900)]
Fix a compilation error (debug build)
--HG--
branch : stable
sdottaka [Thu, 2 Oct 2014 16:49:09 +0000 (01:49 +0900)]
MainFrm.cpp: Remove accidently duplicated code
sdottaka [Thu, 2 Oct 2014 16:29:51 +0000 (01:29 +0900)]
Constify some methods
--HG--
branch : stable
sdottaka [Thu, 2 Oct 2014 10:02:34 +0000 (19:02 +0900)]
DirView.*: Delete unnecessary CDirView::OnPluginsList()function
--HG--
branch : stable
sdottaka [Thu, 2 Oct 2014 08:41:31 +0000 (17:41 +0900)]
Merge with stable
sdottaka [Sun, 28 Sep 2014 17:18:44 +0000 (02:18 +0900)]
Added tag 2.14.0+-jp-56 for changeset
ce5a7809b9d5
--HG--
branch : stable
sdottaka [Sun, 28 Sep 2014 17:02:31 +0000 (02:02 +0900)]
Bump revision to 2.14.0+-jp-56
--HG--
branch : stable
sdottaka [Sun, 28 Sep 2014 17:01:53 +0000 (02:01 +0900)]
Update winimerge to changeset 32:
2b34fc4b2abf
--HG--
branch : stable
sdottaka [Sun, 28 Sep 2014 17:01:20 +0000 (02:01 +0900)]
ImgMergeFrm.cpp: Did not remove *.ficache file when exiting WinMerge
--HG--
branch : stable
sdottaka [Sun, 28 Sep 2014 16:57:17 +0000 (01:57 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 28 Sep 2014 16:55:59 +0000 (01:55 +0900)]
Assign Ctrl+0 to reset zoom ratio
--HG--
branch : stable
sdottaka [Sun, 28 Sep 2014 02:53:14 +0000 (11:53 +0900)]
Bump revison to 2.14.0+-jp-55
--HG--
branch : stable
sdottaka [Sun, 28 Sep 2014 02:52:01 +0000 (11:52 +0900)]
ImgMergeFrm.cpp: Display (x, y), RGBA and color distance in status bar
--HG--
branch : stable
sdottaka [Sat, 27 Sep 2014 12:03:44 +0000 (21:03 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sat, 27 Sep 2014 11:56:03 +0000 (20:56 +0900)]
Merge.rc: move menu items
--HG--
branch : stable
sdottaka [Sat, 27 Sep 2014 05:04:42 +0000 (14:04 +0900)]
BCMenu.cpp: Optimization: avoid creating toolbar window if not needed
--HG--
branch : stable
sdottaka [Fri, 26 Sep 2014 22:20:26 +0000 (07:20 +0900)]
HexView: Implement "Reload" menu item
--HG--
branch : stable
sdottaka [Fri, 26 Sep 2014 15:53:22 +0000 (00:53 +0900)]
Update translations
--HG--
branch : stable
OSDN Git Service
