OSDN Git Service
sdottaka [Sun, 20 Oct 2013 04:23:46 +0000 (13:23 +0900)]
Merge with stable
sdottaka [Sun, 20 Oct 2013 04:11:52 +0000 (13:11 +0900)]
Added tag 2.14.0+-jp-18 for changeset
b7fdb49b470f
--HG--
branch : stable
sdottaka [Sun, 20 Oct 2013 03:59:02 +0000 (12:59 +0900)]
Update revisions
--HG--
branch : stable
sdottaka [Sun, 29 Sep 2013 11:46:17 +0000 (20:46 +0900)]
Merge with stable
sdottaka [Sun, 29 Sep 2013 01:00:35 +0000 (10:00 +0900)]
Added tag 2.14.0+-jp-17 for changeset
cea149553222
--HG--
branch : stable
sdottaka [Sun, 29 Sep 2013 00:59:53 +0000 (09:59 +0900)]
HexView: left only file or right only file can be now opened in Hex view
--HG--
branch : stable
sdottaka [Sat, 28 Sep 2013 01:33:35 +0000 (10:33 +0900)]
Update Merge_FC_loose.flt for VS2010
--HG--
branch : stable
sdottaka [Sat, 14 Sep 2013 03:06:12 +0000 (12:06 +0900)]
Disable events when opening Excel workbooks, to avoid VBA macro errors
--HG--
branch : stable
sdottaka [Mon, 9 Sep 2013 15:17:37 +0000 (00:17 +0900)]
Merge with stable
sdottaka [Mon, 9 Sep 2013 15:15:43 +0000 (00:15 +0900)]
Use boost::int64_t instead of Poco::Int64
sdottaka [Mon, 9 Sep 2013 15:13:32 +0000 (00:13 +0900)]
Add file used in boost/cstdint.hpp
sdottaka [Mon, 9 Sep 2013 15:06:49 +0000 (00:06 +0900)]
fix mixed eol-style
--HG--
branch : stable
sdottaka [Mon, 9 Sep 2013 15:06:18 +0000 (00:06 +0900)]
Fix unsynchronized header bar and editor panes while loading large files
--HG--
branch : stable
sdottaka [Mon, 9 Sep 2013 14:14:23 +0000 (23:14 +0900)]
Update revisions
--HG--
branch : stable
sdottaka [Mon, 9 Sep 2013 14:14:05 +0000 (23:14 +0900)]
Include Jochen's version of Frhed (https://bitbucket.org/jtuc/frhed/)
--HG--
branch : stable
sdottaka [Wed, 4 Sep 2013 15:18:20 +0000 (00:18 +0900)]
Fix x64 compilation error
sdottaka [Wed, 4 Sep 2013 15:10:09 +0000 (00:10 +0900)]
Add boost/cstdint.hpp
sdottaka [Sun, 1 Sep 2013 00:11:08 +0000 (09:11 +0900)]
Fix ANSI build compilation
sdottaka [Sat, 31 Aug 2013 18:16:49 +0000 (03:16 +0900)]
Use paths_FindFileName() or paths_GetPathOnly() instead of paths_SplitFileName()
sdottaka [Sat, 31 Aug 2013 12:54:57 +0000 (21:54 +0900)]
Add string_to_str()
sdottaka [Wed, 28 Aug 2013 13:15:42 +0000 (22:15 +0900)]
Added tag 2.14.0+-jp-16 for changeset
79e01f9fe331
--HG--
branch : stable
sdottaka [Wed, 28 Aug 2013 12:41:04 +0000 (21:41 +0900)]
Update revisions
--HG--
branch : stable
sdottaka [Tue, 27 Aug 2013 13:37:22 +0000 (22:37 +0900)]
Merge with stable
sdottaka [Tue, 27 Aug 2013 13:35:04 +0000 (22:35 +0900)]
Fix crash when opening directories before completing folder compare
--HG--
branch : stable
sdottaka [Tue, 27 Aug 2013 13:08:57 +0000 (22:08 +0900)]
FolderCompare: fix build error
sdottaka [Mon, 26 Aug 2013 15:15:32 +0000 (00:15 +0900)]
Rename String_join() to string_join()
sdottaka [Mon, 26 Aug 2013 15:12:18 +0000 (00:12 +0900)]
* Move CDirView/CDirDoc's MFC independent code to DirActions.* and DirViewColItems.*
* Remove DirViewColHandler.cpp
sdottaka [Mon, 26 Aug 2013 12:53:48 +0000 (21:53 +0900)]
Add boost::bind
sdottaka [Mon, 26 Aug 2013 12:42:52 +0000 (21:42 +0900)]
Use String_join()
sdottaka [Sun, 18 Aug 2013 16:27:55 +0000 (01:27 +0900)]
* Move CDirView/CDirDoc's MFC independent code to DirActions.*
* Remove MFC dependency from 7zCommon.h, DirActions.*
* Prepare for 3way folder diff
sdottaka [Sun, 18 Aug 2013 16:08:20 +0000 (01:08 +0900)]
The iterator of PathContext class seems to work
sdottaka [Sun, 18 Aug 2013 15:59:25 +0000 (00:59 +0900)]
* Rename DIFFCODE::IsSide() to DIFFCODE::IsSideOnly()
* Add DIFFCODE::setSideFlag(), DIFFCODE::unsetSideFlag()
sdottaka [Sun, 18 Aug 2013 15:57:40 +0000 (00:57 +0900)]
Add #include <ShellAPI.h>
sdottaka [Sun, 18 Aug 2013 15:52:33 +0000 (00:52 +0900)]
Delete unnecessary CMergeEditView::OnPluginsList()
sdottaka [Sun, 18 Aug 2013 15:48:57 +0000 (00:48 +0900)]
Add iterator for PathContext class
sdottaka [Sun, 18 Aug 2013 15:44:05 +0000 (00:44 +0900)]
Add String_join() function template
sdottaka [Sun, 18 Aug 2013 15:43:34 +0000 (00:43 +0900)]
Add PutFilesToClipboard() function template
sdottaka [Sun, 4 Aug 2013 21:43:22 +0000 (06:43 +0900)]
Add DirItemIterator.h and use it
sdottaka [Sat, 3 Aug 2013 12:06:59 +0000 (21:06 +0900)]
Merge parts of WinMerge2011's changeset r504
sdottaka [Sat, 3 Aug 2013 03:26:29 +0000 (12:26 +0900)]
Remove MFC dependency from *Dlg.h
sdottaka [Tue, 30 Jul 2013 14:24:02 +0000 (23:24 +0900)]
Fix mixed eol-style
sdottaka [Tue, 30 Jul 2013 14:23:22 +0000 (23:23 +0900)]
Move f_RegDir to Constants.h
sdottaka [Tue, 30 Jul 2013 14:06:22 +0000 (23:06 +0900)]
Remove an unused function (CDirView::DoUpdateFileEncodingDialog)
sdottaka [Sun, 28 Jul 2013 10:46:56 +0000 (19:46 +0900)]
Added tag 2.14.0+-jp-15 for changeset
37fdc816aa4d
--HG--
branch : stable
sdottaka [Wed, 24 Jul 2013 17:13:58 +0000 (02:13 +0900)]
Fix broken unit tests
--HG--
branch : stable
sdottaka [Wed, 24 Jul 2013 17:13:58 +0000 (02:13 +0900)]
Fix broken unit tests
sdottaka [Wed, 24 Jul 2013 15:49:25 +0000 (00:49 +0900)]
Fix crashes in unit tests (built by VC2010)
--HG--
branch : stable
sdottaka [Wed, 24 Jul 2013 15:49:25 +0000 (00:49 +0900)]
Fix crashes in unit tests (built by VC2010)
sdottaka [Tue, 23 Jul 2013 14:15:16 +0000 (23:15 +0900)]
Merge with stable
sdottaka [Tue, 23 Jul 2013 14:06:44 +0000 (23:06 +0900)]
Update revisions
--HG--
branch : stable
sdottaka [Tue, 23 Jul 2013 13:48:42 +0000 (22:48 +0900)]
Fix: SaveClosingDlg is not shown in the center of the MainFrame
sdottaka [Sun, 21 Jul 2013 15:02:03 +0000 (00:02 +0900)]
Fix mixed eol-style
sdottaka [Sun, 21 Jul 2013 11:13:06 +0000 (20:13 +0900)]
Merge r8142
sdottaka [Sun, 21 Jul 2013 01:46:25 +0000 (10:46 +0900)]
Reduce compilation warnings
sdottaka [Sat, 20 Jul 2013 08:18:14 +0000 (17:18 +0900)]
Fix compilation error with VS7.1
--HG--
branch : stable
sdottaka [Sat, 20 Jul 2013 08:18:14 +0000 (17:18 +0900)]
Fix compilation error with VS7.1
sdottaka [Sat, 20 Jul 2013 08:14:27 +0000 (17:14 +0900)]
* Add UnitTests.vcxproj
* Fix link error of UnitTests
--HG--
branch : stable
sdottaka [Sun, 20 Oct 2013 03:13:27 +0000 (12:13 +0900)]
Add synchronization points UI like meld(meldmerge.org)
--HG--
branch : stable
sdottaka [Sat, 19 Oct 2013 13:59:16 +0000 (22:59 +0900)]
Fix crash when comparing XML or HTML files on multi-core machine... orz
--HG--
branch : stable
sdottaka [Sat, 19 Oct 2013 11:26:32 +0000 (20:26 +0900)]
Remove unused function
--HG--
branch : stable
sdottaka [Sat, 19 Oct 2013 08:07:59 +0000 (17:07 +0900)]
Header bar wasn't synchronized with splitter position
--HG--
branch : stable
sdottaka [Sat, 20 Jul 2013 08:14:27 +0000 (17:14 +0900)]
* Add UnitTests.vcxproj
* Fix link error of UnitTests
sdottaka [Sun, 14 Jul 2013 08:58:48 +0000 (17:58 +0900)]
Merge r8138
sdottaka [Sun, 14 Jul 2013 08:57:47 +0000 (17:57 +0900)]
Added tag 2.14.0+-jp-14 for changeset
918180abd795
sdottaka [Sun, 14 Jul 2013 08:53:30 +0000 (17:53 +0900)]
Merge r8129
sdottaka [Sun, 14 Jul 2013 07:39:44 +0000 (16:39 +0900)]
Merge r8128
sdottaka [Sun, 14 Jul 2013 07:30:02 +0000 (16:30 +0900)]
Update revisions
sdottaka [Sun, 14 Jul 2013 07:29:48 +0000 (16:29 +0900)]
Add "Close Select Files or Folders Dialog on clicking OK button" option. close #26
sdottaka [Sun, 14 Jul 2013 04:55:56 +0000 (13:55 +0900)]
Make OpenDlg resizable again. close #27
sdottaka [Sun, 7 Jul 2013 14:16:49 +0000 (23:16 +0900)]
Remove MFC dependency from SourceControl.cpp
sdottaka [Sun, 7 Jul 2013 07:30:58 +0000 (16:30 +0900)]
* Separate CustomStatusCursor class from WaitStatusCursor.{h,cpp}
* Remove Windows dependency from WaitStatusCursor.h
sdottaka [Sun, 7 Jul 2013 05:19:52 +0000 (14:19 +0900)]
OptionsMgr: avoid unneccessary copying values
sdottaka [Sun, 7 Jul 2013 04:53:17 +0000 (13:53 +0900)]
Merge with rev.8128
sdottaka [Sun, 7 Jul 2013 04:37:27 +0000 (13:37 +0900)]
Merge with rev.8123
sdottaka [Sun, 7 Jul 2013 04:26:24 +0000 (13:26 +0900)]
Add string_stoi() function similar to C++11 std::stoi()
sdottaka [Sat, 6 Jul 2013 14:54:04 +0000 (23:54 +0900)]
Improve startup time
sdottaka [Sat, 6 Jul 2013 05:14:44 +0000 (14:14 +0900)]
paths_FindFileName(): return the folder name if passing the path with trailing slash
sdottaka [Sat, 6 Jul 2013 02:48:18 +0000 (11:48 +0900)]
* Replace CString with String
* Replace BOOL with bool
* Add DDXHelper.h for helping String<->CString conversion
sdottaka [Sat, 6 Jul 2013 02:39:24 +0000 (11:39 +0900)]
Fix broken paths_AddTrailingSlash() ...
sdottaka [Sun, 30 Jun 2013 13:56:06 +0000 (22:56 +0900)]
Move SourceControl related methods of the CMainFrame class to SourceControl class
sdottaka [Sun, 30 Jun 2013 12:37:21 +0000 (21:37 +0900)]
Add #include <algorithm> for std::reverse()
sdottaka [Sun, 30 Jun 2013 10:21:43 +0000 (19:21 +0900)]
* Add paths_AddTrailingSlash() & use it
* Use paths_ConcatPath()
sdottaka [Fri, 28 Jun 2013 23:43:53 +0000 (08:43 +0900)]
Merge
sdottaka [Fri, 28 Jun 2013 23:40:29 +0000 (08:40 +0900)]
Added tag 2.14.0+-jp-13 for changeset
78f2a78ebb20
sdottaka [Fri, 28 Jun 2013 23:40:11 +0000 (08:40 +0900)]
Update revisions
sdottaka [Fri, 28 Jun 2013 23:04:05 +0000 (08:04 +0900)]
Look at "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\SourceSafe\\Databases" for finding VSS databases
sdottaka [Fri, 28 Jun 2013 14:40:03 +0000 (23:40 +0900)]
Reduce direct use of Win32API
sdottaka [Thu, 27 Jun 2013 15:10:02 +0000 (00:10 +0900)]
Remove unused functions
sdottaka [Thu, 27 Jun 2013 14:19:43 +0000 (23:19 +0900)]
Install 32-bit ShellExtention for 64-bit Windows
sdottaka [Thu, 27 Jun 2013 14:15:16 +0000 (23:15 +0900)]
Remove unused LogFile.{cpp,h} in vc71 project file
sdottaka [Thu, 27 Jun 2013 14:13:34 +0000 (23:13 +0900)]
Fix: the contents of config log are broken
sdottaka [Thu, 27 Jun 2013 14:01:34 +0000 (23:01 +0900)]
Use WinMerge2011's ssauto.h instead of ssapi.cpp
sdottaka [Sun, 23 Jun 2013 00:41:22 +0000 (09:41 +0900)]
Merge
sdottaka [Sun, 23 Jun 2013 00:29:46 +0000 (09:29 +0900)]
Added tag 2.14.0+-jp-12 for changeset
9226cde7d33e
sdottaka [Sun, 23 Jun 2013 00:29:32 +0000 (09:29 +0900)]
Update revisions
sdottaka [Sun, 23 Jun 2013 00:07:59 +0000 (09:07 +0900)]
Merge rev.8105
sdottaka [Sun, 23 Jun 2013 00:05:33 +0000 (09:05 +0900)]
Fix: VSS integration does not work
sdottaka [Sat, 22 Jun 2013 23:55:30 +0000 (08:55 +0900)]
Fix: strings that include \t or \n is not translated
sdottaka [Tue, 18 Jun 2013 15:12:42 +0000 (00:12 +0900)]
Remove MFC dependency from DirViewColItems.*
sdottaka [Mon, 17 Jun 2013 14:06:08 +0000 (23:06 +0900)]
Use _() macro instead of LoadString() (2)