OSDN Git Service
sdottaka [Thu, 14 Oct 2010 16:38:31 +0000 (01:38 +0900)]
Merge Tim's patch (PATCH: [
3079966 ] Installer: Don't install quick launch icon for Windows 7)
sdottaka [Mon, 11 Oct 2010 15:58:12 +0000 (00:58 +0900)]
Added tag 2.13.13+-jp-7 for changeset
5df255b22afc
sdottaka [Mon, 11 Oct 2010 15:27:34 +0000 (00:27 +0900)]
Merge from rev. 7240:7241 (Tim's changes)
sdottaka [Mon, 11 Oct 2010 14:24:51 +0000 (23:24 +0900)]
Update version numbers
sdottaka [Mon, 11 Oct 2010 14:10:57 +0000 (23:10 +0900)]
Restore caret y-position when reloading changed files
Tim Gerundt [Wed, 6 Oct 2010 18:35:20 +0000 (20:35 +0200)]
Use command line output for UpdatePoFilesFromPotFile in MergeLangX64.vcproj
Tim Gerundt [Wed, 6 Oct 2010 18:24:12 +0000 (20:24 +0200)]
Use Windows EOL for WinMergeX64.sln (Visual Studio don't open it with Unix EOL)
sdottaka [Sun, 5 Sep 2010 16:45:50 +0000 (01:45 +0900)]
Added tag 2.13.13+-jp-6 for changeset
9940d96ada2e
sdottaka [Sun, 5 Sep 2010 15:07:51 +0000 (00:07 +0900)]
Make VS2010 build faster
sdottaka [Sun, 5 Sep 2010 15:06:10 +0000 (00:06 +0900)]
Workaround for bug in CImageList::DrawIndirect in MFC100
sdottaka [Sun, 5 Sep 2010 15:03:32 +0000 (00:03 +0900)]
Prevent DLL hijacking
sdottaka [Sun, 5 Sep 2010 14:57:49 +0000 (23:57 +0900)]
Update version numbers
sdottaka [Sun, 5 Sep 2010 14:56:43 +0000 (23:56 +0900)]
Fix incorrect path of ShellExtensionU.dll
sdottaka [Mon, 26 Jul 2010 18:36:53 +0000 (03:36 +0900)]
Added tag 2.13.13+-jp-5 for changeset
b852f0587157
sdottaka [Mon, 26 Jul 2010 18:36:15 +0000 (03:36 +0900)]
Workaround for broken menu icons in WinMerge compiled with Visual Studio 2010
sdottaka [Mon, 26 Jul 2010 18:32:58 +0000 (03:32 +0900)]
Removed tag 2.13.13+-jp-5
sdottaka [Mon, 26 Jul 2010 18:14:01 +0000 (03:14 +0900)]
Added tag 2.13.13+-jp-5 for changeset
1c380c7b081d
sdottaka [Mon, 26 Jul 2010 18:11:56 +0000 (03:11 +0900)]
Display whether the file has a BOM.
sdottaka [Mon, 26 Jul 2010 18:02:43 +0000 (03:02 +0900)]
Fix broken menu in WinMerge compiled with Visual Studio 2010
sdottaka [Mon, 26 Jul 2010 17:50:36 +0000 (02:50 +0900)]
Fix typo in BuildArc.cmd
sdottaka [Mon, 26 Jul 2010 17:49:05 +0000 (02:49 +0900)]
Update version numbers
sdottaka [Sun, 11 Jul 2010 14:06:53 +0000 (23:06 +0900)]
Added tag 2.13.13+-jp-3 for changeset
4e8c4ab0c924
sdottaka [Sun, 11 Jul 2010 14:04:37 +0000 (23:04 +0900)]
Fix for Visual Studio 2010
sdottaka [Sun, 11 Jul 2010 13:56:43 +0000 (22:56 +0900)]
Fix compilation error.
sdottaka [Sun, 11 Jul 2010 13:54:09 +0000 (22:54 +0900)]
Update version numbers
sdottaka [Sun, 11 Jul 2010 13:51:37 +0000 (22:51 +0900)]
Manual: Update Japanese translation
sdottaka [Sun, 4 Jul 2010 14:46:20 +0000 (23:46 +0900)]
Added tag 2.13.13+-jp-2 for changeset
7f4d37786bf0
sdottaka [Sun, 4 Jul 2010 14:24:08 +0000 (23:24 +0900)]
Fix Issue #4 in the same way as ChildFrm.cpp
sdottaka [Sun, 4 Jul 2010 13:54:27 +0000 (22:54 +0900)]
Use 7-Zip 32-bit version if no 7-zip 64-bit version exists
sdottaka [Sun, 4 Jul 2010 13:48:23 +0000 (22:48 +0900)]
Ctrl-N -> Ctrl+N
sdottaka [Sun, 4 Jul 2010 13:45:48 +0000 (22:45 +0900)]
Add Serbian language.
sdottaka [Sun, 4 Jul 2010 13:44:59 +0000 (22:44 +0900)]
Add 7-Zip 4.65 support to Inno Setup script.
sdottaka [Sun, 4 Jul 2010 12:43:53 +0000 (21:43 +0900)]
Update version numbers
sdottaka [Wed, 30 Jun 2010 12:34:00 +0000 (21:34 +0900)]
Added tag 2.13.13+-jp-1 for changeset
2590c50cad56
sdottaka [Tue, 29 Jun 2010 16:11:03 +0000 (01:11 +0900)]
- Use FindCommentMarker() to find a comment marker
- Fix bug that comment filter treated following lines as the same:
left: ... */ /* ... */ a = 1;
right: ... */ /* ... */ b = 2;
- Add ReplaceSpaces() function to replace spaces in a string with specified string
sdottaka [Tue, 29 Jun 2010 15:39:05 +0000 (00:39 +0900)]
Prevent source archive file from getting too large.
sdottaka [Tue, 29 Jun 2010 15:29:56 +0000 (00:29 +0900)]
Fix a bug introduced in rev.7127 (Fix Testing\EditorTest build problem)
sdottaka [Tue, 29 Jun 2010 14:12:03 +0000 (23:12 +0900)]
Update WinMerge POT and PO files.
sdottaka [Tue, 29 Jun 2010 13:40:35 +0000 (22:40 +0900)]
Merge from rev.7205
sdottaka [Sun, 27 Jun 2010 13:16:56 +0000 (22:16 +0900)]
Fix wrong reverting at rev. 7164
sdottaka [Sun, 27 Jun 2010 12:02:32 +0000 (21:02 +0900)]
Merge from rev. 7160
sdottaka [Sun, 27 Jun 2010 09:41:45 +0000 (18:41 +0900)]
Fix crash when comparing binary files in Folder compare with custom codepage 65001(utf-8)
sdottaka [Sun, 27 Jun 2010 09:17:42 +0000 (18:17 +0900)]
Bug fix for not updating [General] category in Options dialog after importing .ini file.
sdottaka [Sun, 27 Jun 2010 03:32:29 +0000 (12:32 +0900)]
Change timestamp in backup file name to YYYYmmddHHMMSS style
saitaman [Fri, 25 Jun 2010 09:33:36 +0000 (18:33 +0900)]
Issue3:コメントの差異を無視する機能がフォルダ比較に適用されない にて、拡張子を取得する処理がループの外に出ていなかったため再修正
saitaman [Fri, 25 Jun 2010 09:32:12 +0000 (18:32 +0900)]
Issue2:コメントの差異を無視する機能がただしく動作しない ?にて、タブ記号も無視して比較できるよう修正
saitaman [Fri, 25 Jun 2010 09:31:07 +0000 (18:31 +0900)]
Issue2:コメントの差異を無視する機能がただしく動作しない?
Kimmo Varis [Sat, 19 Jun 2010 13:51:51 +0000 (13:51 +0000)]
Fix InnoSetup installer file by adding missing semicolon.
Kimmo Varis [Sat, 19 Jun 2010 13:02:44 +0000 (13:02 +0000)]
WinMerge experimental release 2.13.13. (SVN r7205)
Kimmo Varis [Sat, 19 Jun 2010 13:00:23 +0000 (13:00 +0000)]
Fix typo in release script.
Kimmo Varis [Sat, 19 Jun 2010 12:52:04 +0000 (12:52 +0000)]
Bump WinMerge version to 2.13.13 and Shellextension version to 1.16.3.
Kimmo Varis [Sat, 19 Jun 2010 12:46:49 +0000 (12:46 +0000)]
Translations: Update WinMerge POT and PO files.
Kimmo Varis [Sat, 19 Jun 2010 12:41:51 +0000 (12:41 +0000)]
Changelog: add recent bug fixes and improvements.
Kimmo Varis [Sat, 19 Jun 2010 12:23:00 +0000 (12:23 +0000)]
Restore changelog line that got removed when backing out patch.
Jan Hryz [Sat, 19 Jun 2010 07:40:16 +0000 (07:40 +0000)]
Update of translation
Tim Gerundt [Thu, 17 Jun 2010 20:16:49 +0000 (20:16 +0000)]
PATCH: [
3017674 ] New Serbian Language - Add ShellExtension changes
Tim Gerundt [Thu, 17 Jun 2010 19:37:02 +0000 (19:37 +0000)]
PATCH: [
3017674 ] New Serbian Language
Tim Gerundt [Thu, 17 Jun 2010 16:40:17 +0000 (16:40 +0000)]
PATCH: [
3014912 ] Installer: Set default language with MSI setup
Jochen Tucht [Thu, 17 Jun 2010 05:47:45 +0000 (05:47 +0000)]
PATCH: [
3016907 ] Fix Bug #
2968177 Ignoring comments wrongly recognizes // ...
Jochen Tucht [Mon, 14 Jun 2010 21:27:35 +0000 (21:27 +0000)]
Fix regression from MFC to STL string conversion committed as of revision 6865.
Jochen Tucht [Sun, 13 Jun 2010 20:02:50 +0000 (20:02 +0000)]
Add Merge7z914 to Merge7zInstaller
Jochen Tucht [Sun, 13 Jun 2010 20:01:22 +0000 (20:01 +0000)]
Add Merge7z914.vcxproj
Jochen Tucht [Sun, 13 Jun 2010 15:22:21 +0000 (15:22 +0000)]
fix a warning
Jochen Tucht [Sun, 13 Jun 2010 15:18:34 +0000 (15:18 +0000)]
Fix last commit breaking compilation due to "struct stat" vs. "struct _stat".
Jochen Tucht [Sun, 13 Jun 2010 14:58:54 +0000 (14:58 +0000)]
BUG: [
2982964 ] Wrong time stamp even in latest revision (NOT old bug)
Jochen Tucht [Sun, 13 Jun 2010 12:18:30 +0000 (12:18 +0000)]
CSortHeaderCtrl: Replace GetDllVersion() by SendMessage(CCM_GETVERSION), which works for comctl32.dll 5.80 and better.
As this removes the last reference to GetDllVersion(), we are now ready to drop dllver.cpp/.h.
Jochen Tucht [Sun, 13 Jun 2010 12:10:45 +0000 (12:10 +0000)]
Remove unnecessary #include "dllver.h"
Jochen Tucht [Sun, 13 Jun 2010 10:20:59 +0000 (10:20 +0000)]
PATCH: [
3015416 ] LineFiltersDlg: Employ listview in-place editing capability
Jochen Tucht [Sun, 13 Jun 2010 10:13:37 +0000 (10:13 +0000)]
PATCH: [
3015396 ] Remove obsolete dll version checks
Jochen Tucht [Sun, 13 Jun 2010 09:02:45 +0000 (09:02 +0000)]
CMergeDiffDetailView: Fix an inconsistency in m_lineBegin vs. m_lineEnd vs. m_diffLength, which was occurring after rescan.
Kimmo Varis [Sun, 13 Jun 2010 08:25:01 +0000 (08:25 +0000)]
Update 2.12.4 release notes to trunk.
Kimmo Varis [Sat, 12 Jun 2010 13:00:33 +0000 (13:00 +0000)]
Buildscript: Use Python's optparse module to parse command line.
Kimmo Varis [Sat, 12 Jun 2010 12:55:52 +0000 (12:55 +0000)]
BUG: #
2995925 No refreshing after merging difference
Revert revisions 7086 and 7089 to fix the regression.
Kimmo Varis [Sat, 12 Jun 2010 09:58:16 +0000 (09:58 +0000)]
Fix the changelog item - use the patch ID when it exists.
Kimmo Varis [Sat, 12 Jun 2010 09:56:48 +0000 (09:56 +0000)]
Changelog: Bugfix: Line filtering wasted huge amounts of memory
Jochen Tucht [Fri, 11 Jun 2010 19:59:11 +0000 (19:59 +0000)]
PATCH: [
3014162 ] Fix LineFilters wasting enormous amounts of memory
Jochen Tucht [Wed, 9 Jun 2010 06:22:56 +0000 (06:22 +0000)]
HexMergeView: Differences could fail to show up in left pane unless some action was taken that would cause a repaint (seen on Vista with OPT_SCROLL_TO_FIRST off).
saitaman [Tue, 8 Jun 2010 10:44:24 +0000 (19:44 +0900)]
Issue3:コメントの差異を無視する機能がフォルダ比較に適用されない
について修正
saitaman [Tue, 8 Jun 2010 10:40:09 +0000 (19:40 +0900)]
Issue2:コメントの差異を無視する機能がただしく動作しない?
を再修正(ソースの書き方でまずかった個所を修正)
saitaman [Tue, 8 Jun 2010 10:39:06 +0000 (19:39 +0900)]
wchar_tをTCHARに修正
Jochen Tucht [Sun, 6 Jun 2010 13:41:33 +0000 (13:41 +0000)]
Fix an apparent bug in to_utf8_advance()
Jochen Tucht [Wed, 2 Jun 2010 14:51:43 +0000 (14:51 +0000)]
VC2010 does not accept a dot to serve as a class resolution operator
Tim Gerundt [Wed, 2 Jun 2010 06:24:43 +0000 (06:24 +0000)]
Fix some batch files paths in Merge.vcproj
Tim Gerundt [Wed, 2 Jun 2010 06:19:33 +0000 (06:19 +0000)]
Fix CreateMasterPotFile calls in MergeLangX64.vcproj
sdottaka [Sat, 29 May 2010 00:15:23 +0000 (09:15 +0900)]
Fix compile error and runtime error with VS2010
sdottaka [Sun, 23 May 2010 13:54:21 +0000 (22:54 +0900)]
Fix merge mistake
sdottaka [Sun, 23 May 2010 13:32:53 +0000 (22:32 +0900)]
Merge
sdottaka [Sun, 23 May 2010 13:24:08 +0000 (22:24 +0900)]
Update version numbers
sdottaka [Sun, 23 May 2010 13:18:41 +0000 (22:18 +0900)]
Merge from rev.7128:7151 (2)
sdottaka [Sun, 23 May 2010 13:07:43 +0000 (22:07 +0900)]
Added filter rules for git, bzr, hg
sdottaka [Sun, 23 May 2010 13:05:03 +0000 (22:05 +0900)]
Added convert script from lf to crlf
sdottaka [Sun, 23 May 2010 12:58:54 +0000 (21:58 +0900)]
Merge from rev.7128:7151
saitaman [Sun, 23 May 2010 07:18:03 +0000 (16:18 +0900)]
Issue4:ステータスバーのメッセージが翻訳されないことがある
を修正
sdottaka [Sat, 22 May 2010 05:38:41 +0000 (14:38 +0900)]
Fix Testing\EditorTest build problem
sdottaka [Sat, 22 May 2010 05:28:47 +0000 (14:28 +0900)]
Change the EOL of po files to Unix
sdottaka [Sat, 22 May 2010 05:08:35 +0000 (14:08 +0900)]
Fix x86 build problem
Jochen Tucht [Wed, 19 May 2010 12:57:18 +0000 (12:57 +0000)]
Restart discussion about binary file detection (TODO #
1946860)
Jochen Tucht [Wed, 19 May 2010 12:25:14 +0000 (12:25 +0000)]
Fix possible access beyond end of memory mapped file
Jochen Tucht [Sun, 16 May 2010 15:19:15 +0000 (15:19 +0000)]
string_replace(): Fix infinite loop if (replace) contains an occurrence of (find) at a position greater than the length of (find).
Jochen Tucht [Sun, 16 May 2010 14:44:19 +0000 (14:44 +0000)]
• Read 7-Zip version from 7z.dll (which has long ago replaced the various format and codec DLLs)
• Change recommended version of 7-Zip to 4.65