OSDN Git Service
Takashi Sawanaka [Sun, 4 Dec 2016 13:38:10 +0000 (22:38 +0900)]
Bump revision to 2.14.0+-jp-124
Takashi Sawanaka [Sun, 4 Dec 2016 11:38:32 +0000 (20:38 +0900)]
Replace env_* with env::*
Takashi Sawanaka [Sun, 4 Dec 2016 11:00:04 +0000 (20:00 +0900)]
Replace paths_* with paths::*
Takashi Sawanaka [Sun, 4 Dec 2016 07:37:19 +0000 (16:37 +0900)]
Retry to detect the encoding of a file using all content when occurred encoding error. fixes github-issue#13.
Takashi Sawanaka [Fri, 2 Dec 2016 13:57:48 +0000 (22:57 +0900)]
Merge pull request #12 from Lippe35/master
Corrections and add missing translation (Portuguese.isl) Part3
Lippe35 [Fri, 2 Dec 2016 10:32:35 +0000 (10:32 +0000)]
Corrections and add missing translation (Portuguese.isl) Part3
Takashi Sawanaka [Thu, 1 Dec 2016 14:39:21 +0000 (23:39 +0900)]
Merge pull request #11 from Lippe35/master
More add missing translation (Portuguese.isl)
Takashi Sawanaka [Thu, 1 Dec 2016 14:38:58 +0000 (23:38 +0900)]
Merge pull request #10 from Lippe35/master
Add missing translation (Portuguese.isl)
Lippe35 [Wed, 30 Nov 2016 19:17:34 +0000 (19:17 +0000)]
More add missing translation (Portuguese.isl)
Lippe35 [Wed, 30 Nov 2016 18:11:00 +0000 (18:11 +0000)]
Add missing translation (Portuguese.isl)
Takashi Sawanaka [Wed, 30 Nov 2016 15:06:34 +0000 (00:06 +0900)]
Added tag 2.14.0+-jp-123 for changeset
0b52022c996c
Takashi Sawanaka [Wed, 30 Nov 2016 15:05:53 +0000 (00:05 +0900)]
Bump revision to 2.14.0+-jp-123
Takashi Sawanaka [Tue, 29 Nov 2016 14:57:37 +0000 (23:57 +0900)]
Added tag 2.14.0+-jp-122 for changeset
c695cb7835ff
Takashi Sawanaka [Tue, 29 Nov 2016 14:37:00 +0000 (23:37 +0900)]
Merge
Takashi Sawanaka [Sun, 27 Nov 2016 14:11:29 +0000 (23:11 +0900)]
Bump revision to 2.14.0+-jp-122
Takashi Sawanaka [Sun, 27 Nov 2016 12:17:12 +0000 (21:17 +0900)]
BuildBin.cmd: The file "2" was created after BuildBin.cmd was executed.
Takashi Sawanaka [Sun, 27 Nov 2016 11:32:14 +0000 (20:32 +0900)]
MergeDoc.cpp: Use std::int64_t instead of boost::int64_t
Takashi Sawanaka [Sun, 27 Nov 2016 11:24:22 +0000 (20:24 +0900)]
Merge.rc: fine-tune button position
Takashi Sawanaka [Sun, 27 Nov 2016 11:23:26 +0000 (20:23 +0900)]
Remove unused #include directives
Takashi Sawanaka [Sat, 26 Nov 2016 13:35:52 +0000 (22:35 +0900)]
paths.*: Add paths_ToWindowsPath() and paths_ToUnixPath() function
Takashi Sawanaka [Sat, 26 Nov 2016 11:04:17 +0000 (20:04 +0900)]
FolderCompare.exe: make FolderCompare.exe buildable with MinGW again
Takashi Sawanaka [Sat, 19 Nov 2016 21:48:12 +0000 (06:48 +0900)]
Merge
Takashi Sawanaka [Sat, 19 Nov 2016 21:42:55 +0000 (06:42 +0900)]
Remove wrongly pushed WinIMerge sources
Takashi Sawanaka [Sat, 19 Nov 2016 21:07:14 +0000 (06:07 +0900)]
Merge pull request #9 from Lippe35/master
Fix line 358 (Portuguese.isl)
Lippe35 [Sat, 19 Nov 2016 14:44:30 +0000 (14:44 +0000)]
Fix line 358 (Portuguese.isl)
Takashi Sawanaka [Fri, 18 Nov 2016 14:15:14 +0000 (23:15 +0900)]
Merge pull request #8 from Lippe35/master
Corrections and Add missing translation (Portuguese.po) Part6
Lippe35 [Fri, 18 Nov 2016 06:58:36 +0000 (06:58 +0000)]
Corrections and Add missing translation (Portuguese.po) Part6
Add missing translation in (Portuguese.isl)
Takashi Sawanaka [Sun, 13 Nov 2016 10:47:10 +0000 (19:47 +0900)]
Added tag 2.14.0+-jp-121 for changeset
9d85a0db6c7d
Takashi Sawanaka [Sun, 13 Nov 2016 10:44:00 +0000 (19:44 +0900)]
Bump revision to 2.14.0+-jp-121
Takashi Sawanaka [Sun, 13 Nov 2016 10:42:53 +0000 (19:42 +0900)]
Update WinIMerge to 1.0.4.0
Takashi Sawanaka [Sun, 13 Nov 2016 09:18:56 +0000 (18:18 +0900)]
Bump revision to 1.0.4.0
Takashi Sawanaka [Sun, 13 Nov 2016 09:04:21 +0000 (18:04 +0900)]
- Make diff block blinkable
- Add 'Alpha Animation' item to 'Overlay' combobox
Takashi Sawanaka [Sun, 6 Nov 2016 13:02:31 +0000 (22:02 +0900)]
CrystalEdit Sample: Fix crash when loading a file that includes a line over 256 chars
Takashi Sawanaka [Sun, 6 Nov 2016 12:05:49 +0000 (21:05 +0900)]
Cppcheck: Variable 'bMayOverwrite' is reassigned a value before the old one has been used.
Takashi Sawanaka [Sun, 6 Nov 2016 07:18:11 +0000 (16:18 +0900)]
FilepathEdit.cpp: Fix a buffer overflow problem
Takashi Sawanaka [Sat, 5 Nov 2016 13:01:30 +0000 (22:01 +0900)]
Fix: 3rd header bar was not resized when resizing 3rd pane
Takashi Sawanaka [Thu, 3 Nov 2016 14:39:23 +0000 (23:39 +0900)]
Merge pull request #7 from Lippe35/master
Corrections and Add missing translation (Portuguese.po) Part5
Lippe35 [Thu, 3 Nov 2016 13:01:59 +0000 (13:01 +0000)]
Corrections and Add missing translation (Portuguese.po) Part5
Takashi Sawanaka [Wed, 2 Nov 2016 14:34:20 +0000 (23:34 +0900)]
Merge pull request #6 from Lippe35/master
Corrections and Add missing translation (Portuguese.po) Part4
Lippe35 [Wed, 2 Nov 2016 12:01:21 +0000 (12:01 +0000)]
Corrections and Add missing translation (Portuguese.po) Part4
Takashi Sawanaka [Mon, 31 Oct 2016 15:32:00 +0000 (00:32 +0900)]
Added tag 2.14.0+-jp-120 for changeset
99bb6a5a83a0
Takashi Sawanaka [Mon, 31 Oct 2016 15:31:45 +0000 (00:31 +0900)]
Bump revision to 2.14.0+-jp-120
Takashi Sawanaka [Mon, 31 Oct 2016 15:31:11 +0000 (00:31 +0900)]
Installer: Update 7-zip to 16.04
Takashi Sawanaka [Mon, 31 Oct 2016 14:54:13 +0000 (23:54 +0900)]
BuildArc.cmd: Include all *.po files indto zip archive file
Takashi Sawanaka [Sun, 30 Oct 2016 08:20:05 +0000 (17:20 +0900)]
Update 7-zip to 16.04
Takashi Sawanaka [Sat, 29 Oct 2016 12:39:16 +0000 (21:39 +0900)]
Merge pull request #5 from Lippe35/master
Corrections and Add missing translation (Portuguese.po) Part3
Lippe35 [Fri, 28 Oct 2016 22:16:37 +0000 (23:16 +0100)]
Corrections and Add missing translation (Portuguese.po) Part3
Takashi Sawanaka [Sun, 23 Oct 2016 13:19:16 +0000 (22:19 +0900)]
Added tag 2.14.0+-jp-119 for changeset
40629ddb1446
Takashi Sawanaka [Sun, 23 Oct 2016 12:51:08 +0000 (21:51 +0900)]
Bump revision to 2.14.0+-jp-119
Takashi Sawanaka [Sun, 23 Oct 2016 12:24:28 +0000 (21:24 +0900)]
ImgMergeFrm.*: Update tabbar item when comparing image files are changed
Takashi Sawanaka [Sat, 22 Oct 2016 12:57:31 +0000 (21:57 +0900)]
binary files were recognized as text files when comparing two same folder paths
Takashi Sawanaka [Sat, 22 Oct 2016 11:11:07 +0000 (20:11 +0900)]
Add 'View->Diff Context->Toggle All and 0-9 Lines' menu item
Takashi Sawanaka [Sun, 9 Oct 2016 12:00:01 +0000 (12:00 +0000)]
readme.md edited online with Bitbucket
Takashi Sawanaka [Fri, 7 Oct 2016 15:41:59 +0000 (00:41 +0900)]
Merge pull request #4 from Lippe35/master
Corrections and Add missing translation (Portuguese.po) Part2
Lippe35 [Thu, 6 Oct 2016 19:49:06 +0000 (20:49 +0100)]
Corrections and Add missing translation (Portuguese.po) Part2
Takashi Sawanaka [Sat, 1 Oct 2016 04:29:42 +0000 (13:29 +0900)]
Portuguese.po: Recover broken text
Takashi Sawanaka [Fri, 30 Sep 2016 22:16:28 +0000 (07:16 +0900)]
Contributors.txt: Add Lippe35 as Portuguese translater to Contributors.txt
Takashi Sawanaka [Fri, 30 Sep 2016 22:12:55 +0000 (07:12 +0900)]
Portuguese.po: Fix the error "Unresolved or mismatched references detected when atempting to read translations from ..."
Takashi Sawanaka [Fri, 30 Sep 2016 21:58:40 +0000 (06:58 +0900)]
Merge pull request #3 from Lippe35/master
Corrections and Add missing translation (Portuguese.po) Part1
Lippe35 [Fri, 30 Sep 2016 14:59:55 +0000 (15:59 +0100)]
Corrections and Add missing translation (Portuguese.po) Part1
Takashi Sawanaka [Sun, 25 Sep 2016 14:25:00 +0000 (23:25 +0900)]
Added tag 2.14.0+-jp-118 for changeset
12534262c011
Takashi Sawanaka [Sun, 25 Sep 2016 14:24:46 +0000 (23:24 +0900)]
Removed tag 2.14.0+-jp-118
Takashi Sawanaka [Sun, 25 Sep 2016 14:14:38 +0000 (23:14 +0900)]
Forget to merge from WinMerge2011
Takashi Sawanaka [Sun, 25 Sep 2016 11:23:27 +0000 (20:23 +0900)]
Added tag 2.14.0+-jp-118 for changeset
b0fb758b8bae
Takashi Sawanaka [Sun, 25 Sep 2016 11:23:16 +0000 (20:23 +0900)]
Bump revision to 2.14.0+-jp-118
Takashi Sawanaka [Sun, 25 Sep 2016 10:57:53 +0000 (19:57 +0900)]
Update WiX installer project
Takashi Sawanaka [Sun, 25 Sep 2016 10:56:03 +0000 (19:56 +0900)]
OptionsInit.cpp: Disable mlang.dll on non-CJK environment
Takashi Sawanaka [Sun, 25 Sep 2016 06:45:43 +0000 (15:45 +0900)]
OptionsInit.cpp: Make Tree Mode checked by default
Takashi Sawanaka [Sun, 25 Sep 2016 06:22:32 +0000 (15:22 +0900)]
Installer: Make Plugins option checked by default
Takashi Sawanaka [Sun, 25 Sep 2016 01:49:52 +0000 (10:49 +0900)]
Fix to display the Left|Right EOL column correctly. close #53. (Merge from WinMerge2011)
Takashi Sawanaka [Sat, 24 Sep 2016 05:19:42 +0000 (14:19 +0900)]
Plugins.cpp: Ignore *.sct~ files
Takashi Sawanaka [Sat, 24 Sep 2016 05:00:05 +0000 (14:00 +0900)]
CompareMSExcelFiles.sct: Add 'Update external references(links)' checkbox to plugin settings window
Takashi Sawanaka [Sat, 24 Sep 2016 04:52:45 +0000 (13:52 +0900)]
CompareMSExcelFiles.sct: Remove trailing spaces and make setting window size larger
Takashi Sawanaka [Sun, 4 Sep 2016 10:55:03 +0000 (19:55 +0900)]
Added tag 2.14.0+-jp-117 for changeset
573d8dbb6181
Takashi Sawanaka [Sun, 4 Sep 2016 10:54:36 +0000 (19:54 +0900)]
Bump revision to 2.14.0+-jp-117
Takashi Sawanaka [Sun, 4 Sep 2016 10:39:21 +0000 (19:39 +0900)]
Make merge editor window D&Dable
Takashi Sawanaka [Sun, 28 Aug 2016 10:47:50 +0000 (19:47 +0900)]
Added tag 2.14.0+-jp-116 for changeset
292709b2371e
Takashi Sawanaka [Sun, 28 Aug 2016 10:47:34 +0000 (19:47 +0900)]
Bump revision to 2.14.0+-jp-116
Takashi Sawanaka [Sun, 28 Aug 2016 10:44:50 +0000 (19:44 +0900)]
Implement Identical Files message box for binary file compare view (Merge from https://bitbucket.org/jtuc/winmerge2011/commits/
649b17983f56178dd5d2bfc0d98926850f3d0bb7)
Takashi Sawanaka [Sat, 27 Aug 2016 04:07:41 +0000 (13:07 +0900)]
ImgMergeFrm.*: fix: text on header bars was not selectable
Takashi Sawanaka [Sat, 27 Aug 2016 03:43:49 +0000 (12:43 +0900)]
EditorFilepathBar.*: Add GetText() to IHeaderBar interface
Takashi Sawanaka [Wed, 24 Aug 2016 15:31:17 +0000 (00:31 +0900)]
DirActions.cpp: refactor
Takashi Sawanaka [Wed, 24 Aug 2016 15:24:25 +0000 (00:24 +0900)]
ImgMergeFrm.cpp: background color was not restored correctly
Takashi Sawanaka [Thu, 18 Aug 2016 13:17:50 +0000 (22:17 +0900)]
Cppcheck: C-style pointer casting
Takashi Sawanaka [Tue, 16 Aug 2016 12:53:00 +0000 (21:53 +0900)]
Cppcheck: Variable '...' is assigned a value that is never used.
Takashi Sawanaka [Mon, 15 Aug 2016 09:27:57 +0000 (18:27 +0900)]
Cppcheck: Unsigned variable 'nLoc' can't be negative so it is unnecessary to test it.
Takashi Sawanaka [Mon, 15 Aug 2016 09:11:37 +0000 (18:11 +0900)]
Cppcheck: C-style pointer casting
Takashi Sawanaka [Mon, 15 Aug 2016 08:40:45 +0000 (17:40 +0900)]
Cppcheck: 'class ...' does not have a copy constructor which is recommended since the class contains a pointer to allocated memory.
Takashi Sawanaka [Mon, 15 Aug 2016 08:33:23 +0000 (17:33 +0900)]
Cppcheck: The scope of the variable 'BCMENU_PAD' can be reduced.
Takashi Sawanaka [Mon, 15 Aug 2016 08:27:38 +0000 (17:27 +0900)]
Cppcheck: Exception should be caught by reference.
Takashi Sawanaka [Mon, 15 Aug 2016 08:22:49 +0000 (17:22 +0900)]
Cppcheck: Clarify calculation precedence for '&' and '?'.
Takashi Sawanaka [Mon, 15 Aug 2016 08:10:57 +0000 (17:10 +0900)]
Cppcheck: Missing bounds check for extra iterator increment in loop.
Takashi Sawanaka [Mon, 15 Aug 2016 08:06:26 +0000 (17:06 +0900)]
Cppcheck: Redundant assignment of '...' to itself.
Takashi Sawanaka [Mon, 15 Aug 2016 07:41:38 +0000 (16:41 +0900)]
Cppcheck: syntax error
Takashi Sawanaka [Mon, 15 Aug 2016 07:34:38 +0000 (16:34 +0900)]
Cppcheck: Resource leak: ...
Takashi Sawanaka [Mon, 15 Aug 2016 07:16:26 +0000 (16:16 +0900)]
Cppcheck: Prefer prefix ++/-- operators for non-primitive types.
Takashi Sawanaka [Mon, 15 Aug 2016 07:13:23 +0000 (16:13 +0900)]
Cppcheck: Function parameter 'it' should be passed by reference.
Takashi Sawanaka [Mon, 15 Aug 2016 06:59:57 +0000 (15:59 +0900)]
Cppcheck: Inefficient usage of string::find() in condition; string::compare() would be faster.
Takashi Sawanaka [Mon, 15 Aug 2016 06:45:22 +0000 (15:45 +0900)]
Cppcheck: Variable '...' is assigned in constructor body. Consider performing initialization in initialization list.
Takashi Sawanaka [Mon, 15 Aug 2016 06:35:34 +0000 (15:35 +0900)]
Cppcheck: Consecutive return, break, continue, goto or throw statements are unnecessary.