OSDN Git Service
sdottaka [Fri, 13 Feb 2015 15:11:51 +0000 (00:11 +0900)]
Merge with stable
sdottaka [Fri, 13 Feb 2015 14:47:54 +0000 (23:47 +0900)]
Installer: Add forgotten file heksedit.lng
--HG--
branch : stable
sdottaka [Fri, 13 Feb 2015 13:34:39 +0000 (22:34 +0900)]
Forgot to add PropCompareBinary.{cpp,h}
--HG--
branch : stable
sdottaka [Fri, 13 Feb 2015 12:36:42 +0000 (21:36 +0900)]
Bump revision to 2.14.0+-jp-70
--HG--
branch : stable
sdottaka [Fri, 13 Feb 2015 12:20:03 +0000 (21:20 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Fri, 13 Feb 2015 12:19:41 +0000 (21:19 +0900)]
- Make Hex Editor configurable
- Compare binary files with Hex Editor when the file extensions are registered as binary
--HG--
branch : stable
sdottaka [Fri, 13 Feb 2015 12:09:11 +0000 (21:09 +0900)]
HexEditor: Fix graphical glitch at statusbar
--HG--
branch : stable
sdottaka [Wed, 11 Feb 2015 08:13:48 +0000 (17:13 +0900)]
Fix crash when opening hex view, if frhed is not installed
--HG--
branch : stable
sdottaka [Wed, 11 Feb 2015 08:00:45 +0000 (17:00 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Wed, 11 Feb 2015 07:56:22 +0000 (16:56 +0900)]
Remove unused resource strings
--HG--
branch : stable
sdottaka [Tue, 10 Feb 2015 14:24:48 +0000 (23:24 +0900)]
WinMerge*.iss: Add Frhed/Languages/ja.po
--HG--
branch : stable
sdottaka [Tue, 10 Feb 2015 14:23:14 +0000 (23:23 +0900)]
Poco: Attempt to avoid crash when accessing unstable filesystem or network share
--HG--
branch : stable
sdottaka [Mon, 9 Feb 2015 01:12:21 +0000 (10:12 +0900)]
Merge with stable
sdottaka [Mon, 9 Feb 2015 01:10:23 +0000 (10:10 +0900)]
Bump revision to 2.14.0+-jp-69
--HG--
branch : stable
sdottaka [Mon, 9 Feb 2015 01:09:43 +0000 (10:09 +0900)]
BuildArc.cmd: Fix the path of frhed
--HG--
branch : stable
sdottaka [Sun, 8 Feb 2015 16:17:04 +0000 (01:17 +0900)]
DirView.cpp: Could not copy files in DirView
sdottaka [Sun, 8 Feb 2015 16:16:06 +0000 (01:16 +0900)]
Merge.vcxproj: Add HexMergeView.h
--HG--
branch : stable
sdottaka [Sun, 8 Feb 2015 16:16:06 +0000 (01:16 +0900)]
Merge.vcxproj: Add HexMergeView.h
sdottaka [Sun, 8 Feb 2015 16:15:34 +0000 (01:15 +0900)]
MergeDoc.h: Remove unused function declaration
--HG--
branch : stable
sdottaka [Sun, 8 Feb 2015 16:15:34 +0000 (01:15 +0900)]
MergeDoc.h: Remove unused function declaration
sdottaka [Sun, 8 Feb 2015 16:13:41 +0000 (01:13 +0900)]
HexEditor: Add Undo & Redo feature
--HG--
branch : stable
sdottaka [Sun, 8 Feb 2015 16:13:41 +0000 (01:13 +0900)]
HexEditor: Add Undo & Redo feature
sdottaka [Wed, 28 Jan 2015 11:49:16 +0000 (20:49 +0900)]
Added tag 2.14.0+-jp-68 for changeset
0cb70ac3d833
--HG--
branch : stable
sdottaka [Sun, 25 Jan 2015 06:21:54 +0000 (15:21 +0900)]
Merge with stable
sdottaka [Sat, 24 Jan 2015 08:10:16 +0000 (17:10 +0900)]
Update revision to 2.14.0+-jp-68
--HG--
branch : stable
sdottaka [Sat, 24 Jan 2015 06:14:01 +0000 (15:14 +0900)]
rev. 8127 was incomplete.
--HG--
branch : stable
sdottaka [Thu, 22 Jan 2015 06:50:31 +0000 (15:50 +0900)]
Merge with stable
sdottaka [Thu, 22 Jan 2015 01:45:58 +0000 (10:45 +0900)]
Bump revision to 2.14.0+-jp-67
--HG--
branch : stable
sdottaka [Thu, 22 Jan 2015 01:45:18 +0000 (10:45 +0900)]
CompareMS*Files.sct: Make chkCompareWorksheetsAsImage checkbox checkable whether chkUnpackToFolder checkbox is checked
--HG--
branch : stable
sdottaka [Thu, 22 Jan 2015 01:00:09 +0000 (10:00 +0900)]
DirView.*: Inherit ReadOnly status from parent window when opening new folder window
--HG--
branch : stable
sdottaka [Thu, 22 Jan 2015 00:02:08 +0000 (09:02 +0900)]
CompareMS*Files.sct: Avoid detecting the script calling WScript.Shell#Run as a virus.
--HG--
branch : stable
sdottaka [Fri, 16 Jan 2015 11:36:21 +0000 (20:36 +0900)]
Merge with stable
sdottaka [Fri, 16 Jan 2015 11:17:24 +0000 (20:17 +0900)]
Fix mixed-eol style
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 15:13:24 +0000 (00:13 +0900)]
Merge with 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 [Sat, 20 Dec 2014 11:08:21 +0000 (20:08 +0900)]
Merge with 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: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
OSDN Git Service
