OSDN Git Service
Kimmo Varis [Tue, 22 Jan 2008 14:51:23 +0000 (14:51 +0000)]
Manual: Bump revision number to 1.3.10.
Kimmo Varis [Tue, 22 Jan 2008 14:49:49 +0000 (14:49 +0000)]
PATCH: [
1876770 ] Manual: Add conflict file resolving section
Kimmo Varis [Tue, 22 Jan 2008 14:31:47 +0000 (14:31 +0000)]
Fix a bug that after parsing conflict file resulting files were opened to wrong sides in GUI. Bug found and original fix from Takashi, modified by Kimmo.
Kimmo Varis [Tue, 22 Jan 2008 14:26:00 +0000 (14:26 +0000)]
Fix a bug in ConflictFileParser - it created extra EOL chars as it opened files in text mode. Fixed by opening files as binary. Fix from Takashi.
Kimmo Varis [Tue, 22 Jan 2008 13:54:38 +0000 (13:54 +0000)]
Fix VC6 build by renaming 'map' function argument to disp_map (VC6 thought map was actually std::map typename).
Kimmo Varis [Mon, 21 Jan 2008 14:15:41 +0000 (14:15 +0000)]
PATCH: [
1875853 ] Save modified linefilter when editbox loses focus
Kimmo Varis [Sun, 20 Jan 2008 12:51:10 +0000 (12:51 +0000)]
Docs: Add Francis Irving to contributors as author of original conflict file parser I converted for WinMerge.
Kimmo Varis [Sun, 20 Jan 2008 12:35:07 +0000 (12:35 +0000)]
PATCH: [
1875129 ] Resolve conflict files
Update English.pot and all PO files.
Kimmo Varis [Sun, 20 Jan 2008 12:32:14 +0000 (12:32 +0000)]
PATCH: [
1875129 ] Resolve conflict files
Kimmo Varis [Sun, 20 Jan 2008 11:42:43 +0000 (11:42 +0000)]
Changelog: Bugfix: Clipped text in file saving error message (#
1874854)
Jochen Tucht [Sun, 20 Jan 2008 08:48:53 +0000 (08:48 +0000)]
Kimmo Varis [Sat, 19 Jan 2008 22:21:56 +0000 (22:21 +0000)]
Convert last uses of CString in paths.cpp/paths.h to String.
Kimmo Varis [Sat, 19 Jan 2008 11:38:51 +0000 (11:38 +0000)]
PATCH: [
1874084 ] Remove unused binary status error code
Kimmo Varis [Fri, 18 Jan 2008 20:03:57 +0000 (20:03 +0000)]
PATCH: [
1874047 ] Simpler temp file class
Tim Gerundt [Thu, 17 Jan 2008 00:15:31 +0000 (00:15 +0000)]
[
1873267 ] Create PO files only if necessary
Kimmo Varis [Wed, 16 Jan 2008 21:48:43 +0000 (21:48 +0000)]
Fix a bug that debug builds didn't copy pcre.dll to WinMerge build folder. This is a copy/paste error from my commit to move pcre build files to Build and BuildTmp folders.
Tim Gerundt [Wed, 16 Jan 2008 21:45:11 +0000 (21:45 +0000)]
PATCH: [
1872453 ] Create POT file only if necessary
Tim Gerundt [Wed, 16 Jan 2008 21:37:37 +0000 (21:37 +0000)]
PATCH: [
1872402 ] Check unused resources script
Kimmo Varis [Wed, 16 Jan 2008 21:20:33 +0000 (21:20 +0000)]
Cleanup file loading code by creating couple of helper functions so it doesn't have so much copy/paste for left/right file.
Kimmo Varis [Wed, 16 Jan 2008 20:20:54 +0000 (20:20 +0000)]
Convert description texts in CMainFrame to array.
Takashi Sawanaka [Wed, 16 Jan 2008 03:25:34 +0000 (03:25 +0000)]
BUG: [
1872165 ] Quick Compare issue in 2.7.7.2
Takashi Sawanaka [Wed, 16 Jan 2008 03:25:09 +0000 (03:25 +0000)]
BUG: [
1872165 ] Quick Compare issue in 2.7.7.2
Tim Gerundt [Tue, 15 Jan 2008 22:31:04 +0000 (22:31 +0000)]
Add link to ChangeLog.txt in ReleaseNotes.html
Tim Gerundt [Tue, 15 Jan 2008 20:20:06 +0000 (20:20 +0000)]
BUG: [
1869621 ] xslt support
Kimmo Varis [Mon, 14 Jan 2008 20:03:54 +0000 (20:03 +0000)]
WinMerge experimental release 2.7.7.2 (SVN revision 4915)
Kimmo Varis [Mon, 14 Jan 2008 19:57:14 +0000 (19:57 +0000)]
Update language PO files.
Takashi Sawanaka [Mon, 14 Jan 2008 19:48:16 +0000 (19:48 +0000)]
PATCH: [
1871079 ] File Encoding dialog for MergeDoc
Takashi Sawanaka [Mon, 14 Jan 2008 19:24:56 +0000 (19:24 +0000)]
Kimmo Varis [Mon, 14 Jan 2008 17:01:47 +0000 (17:01 +0000)]
Changelog: Enable file compare to open binary files (#
1869647)
Kimmo Varis [Mon, 14 Jan 2008 16:18:36 +0000 (16:18 +0000)]
Docs: small fixes (typos, wrong links) to index.html files.
Kimmo Varis [Sun, 13 Jan 2008 21:48:12 +0000 (21:48 +0000)]
BUG: [
1814184 ] Right mouse button clears text selection
- backout previous patch and fix as suggested by Dmitry, just checking if there is existing selection before moving caret.
Kimmo Varis [Sun, 13 Jan 2008 20:57:58 +0000 (20:57 +0000)]
Build: Modify pcre project file to use WinMerge's Build and BuildTmp folders. This avoids polluting source tree with build files.
Jochen Tucht [Sun, 13 Jan 2008 19:12:43 +0000 (19:12 +0000)]
Jochen Tucht [Sun, 13 Jan 2008 19:00:04 +0000 (19:00 +0000)]
Jochen Tucht [Sun, 13 Jan 2008 18:56:27 +0000 (18:56 +0000)]
Kimmo Varis [Sun, 13 Jan 2008 16:29:42 +0000 (16:29 +0000)]
Build: Modify scew project file to use WinMerge's Build and BuildTmp folders. This avoids polluting source tree with build files.
Kimmo Varis [Sun, 13 Jan 2008 14:59:22 +0000 (14:59 +0000)]
Build: Modify expat project files to use WinMerge's Build and BuildTmp folders. This avoids polluting source tree with build files.
Kimmo Varis [Sun, 13 Jan 2008 11:17:45 +0000 (11:17 +0000)]
BuildScript: check if folder for release already exists and exit with error message.
Kimmo Varis [Sat, 12 Jan 2008 14:48:41 +0000 (14:48 +0000)]
Move diffutils files to correct folder (Diff.cpp, diffmain.c and Dir.cpp).
Takashi Sawanaka [Sat, 12 Jan 2008 12:22:18 +0000 (12:22 +0000)]
PATCH: [
1869858 ] Patch for [
1866442] Broken buttons code in WinMerge 2.7.7.1
Takashi Sawanaka [Sat, 12 Jan 2008 11:56:24 +0000 (11:56 +0000)]
BUG: [
1869821 ] Register.bat doesn't work on W98 and Vista
Kimmo Varis [Sat, 12 Jan 2008 10:34:45 +0000 (10:34 +0000)]
PATCH: [
1869686 ] Add menuitems and shortcut keys for text zoom
Kimmo Varis [Fri, 11 Jan 2008 16:14:39 +0000 (16:14 +0000)]
Docs: try to clarify compiling instructions a bit.
Kimmo Varis [Thu, 10 Jan 2008 14:57:36 +0000 (14:57 +0000)]
PATCH: [
1718699 ] Bookmark icons relocation
- submitted by Gal, improved version by Kimmo
Tim Gerundt [Wed, 9 Jan 2008 23:16:43 +0000 (23:16 +0000)]
Fix spelling error "succesfully".
Tim Gerundt [Wed, 9 Jan 2008 22:54:43 +0000 (22:54 +0000)]
PATCH: [
1867844 ] Updated Swedish.isl translation
Tim Gerundt [Wed, 9 Jan 2008 22:51:01 +0000 (22:51 +0000)]
PATCH: [
1867765 ] Updated Swedish.po for Trunk
Kimmo Varis [Wed, 9 Jan 2008 15:44:41 +0000 (15:44 +0000)]
Manual: Bump revision to 1.3.9 and update copyright for year 2008.
Kimmo Varis [Wed, 9 Jan 2008 15:42:23 +0000 (15:42 +0000)]
PATCH: [
1867212 ] Manual: clarify file filter's folder name matching
Kimmo Varis [Wed, 9 Jan 2008 14:23:42 +0000 (14:23 +0000)]
PATCH: [
1866183 ] Docs: Add index.html for Docs folder
Tim Gerundt [Tue, 8 Jan 2008 23:15:10 +0000 (23:15 +0000)]
Add "Mario Angel" as Spanish translator to Contributors.txt.
Tim Gerundt [Tue, 8 Jan 2008 23:10:42 +0000 (23:10 +0000)]
PATCH: [
1867234 ] Spanish translation 2.7.6
Tim Gerundt [Tue, 8 Jan 2008 22:57:04 +0000 (22:57 +0000)]
Update all PO files.
Tim Gerundt [Tue, 8 Jan 2008 22:43:08 +0000 (22:43 +0000)]
Add SVN properties to new file editlib\po.cpp
Tim Gerundt [Tue, 8 Jan 2008 22:17:25 +0000 (22:17 +0000)]
Changelog: Add syntax highlighting for PO(T) files (#
1866221).
Tim Gerundt [Tue, 8 Jan 2008 22:11:28 +0000 (22:11 +0000)]
PATCH: [
1866221 ] PO(T) syntax highlighter
Kimmo Varis [Tue, 8 Jan 2008 20:57:23 +0000 (20:57 +0000)]
Rename property dialog resource IDs to match dialog names (IDD_PROPPAGE_LARGE to IDD_PROPPAGE_GENERAL and IDD_PROPPAGE_REGISTRY to IDD_PROPPAGE_SYSTEM).
Kimmo Varis [Tue, 8 Jan 2008 17:41:18 +0000 (17:41 +0000)]
PATCH: [
1865220 ] Close Tab OnMButtonDown
- submitted by Dmitry Maslov
Takashi Sawanaka [Tue, 8 Jan 2008 15:19:54 +0000 (15:19 +0000)]
PATCH: [
1865202 ] Unnecessary registry key is created
Takashi Sawanaka [Tue, 8 Jan 2008 15:00:33 +0000 (15:00 +0000)]
BUG: [
1865168 ] "Integrate w/ Tortoise*"checkboxes in installer aren't shown
Kimmo Varis [Mon, 7 Jan 2008 18:00:51 +0000 (18:00 +0000)]
PATCH: [
1865795 ] Re: [
1832452 ] Horizontal Scrolling with Mouse Wheel
- submitted by Dmitry Maslov
Kimmo Varis [Mon, 7 Jan 2008 16:22:35 +0000 (16:22 +0000)]
Revert previous commit for PATCH #
1865794 - Fix casing of stdafx.h filename in include line. The filename was actually correct...
Kimmo Varis [Mon, 7 Jan 2008 16:18:08 +0000 (16:18 +0000)]
PATCH #
1865794 - Fix casing of stdafx.h filename in include line. Noticed by zitz_alm at users.sourceforge.net.
Tim Gerundt [Mon, 7 Jan 2008 14:19:34 +0000 (14:19 +0000)]
Add "3-way merge" feature request link to Release Notes.
Kimmo Varis [Mon, 7 Jan 2008 00:09:27 +0000 (00:09 +0000)]
PATCH: [
1864556 ] Update Manual URL for Merge7z
Kimmo Varis [Mon, 7 Jan 2008 00:07:24 +0000 (00:07 +0000)]
Move all old changelog files to Docs/Developers/Old-Changelogs. Rename them to their original folder. Move /Src/Changes.txt I missed in earlier commit.
Jochen Tucht [Sun, 6 Jan 2008 19:26:41 +0000 (19:26 +0000)]
Jochen Tucht [Sun, 6 Jan 2008 19:25:20 +0000 (19:25 +0000)]
Jochen Tucht [Sun, 6 Jan 2008 19:23:33 +0000 (19:23 +0000)]
Takashi Sawanaka [Sun, 6 Jan 2008 15:26:19 +0000 (15:26 +0000)]
BUG: [
1864978 ] Doesn't show the contents of the symbolic link target
Kimmo Varis [Sat, 5 Jan 2008 21:56:42 +0000 (21:56 +0000)]
Move all old changelog files to Docs/Developers/Old-Changelogs. Rename them to their original folder.
Kimmo Varis [Sat, 5 Jan 2008 17:32:04 +0000 (17:32 +0000)]
Combine old changelog.txt and readme.txt -changelog files. This is in preparation to move all changelog files to one folder. Previous commit missed files in Docs/Users/Manual -folder.
Kimmo Varis [Sat, 5 Jan 2008 17:20:24 +0000 (17:20 +0000)]
Combine old changelog.txt and readme.txt -changelog files. This is in preparation to move all changelog files to one folder.
Takashi Sawanaka [Sat, 5 Jan 2008 12:45:34 +0000 (12:45 +0000)]
BUG: [
1864040 ] Crash when using TrackPoint middle-button scrolling
Kimmo Varis [Fri, 4 Jan 2008 15:55:30 +0000 (15:55 +0000)]
PATCH: [
1863305 ] Move temp path functions to own files
Kimmo Varis [Mon, 31 Dec 2007 20:28:59 +0000 (20:28 +0000)]
Docs: Translations don't need compiling by developers anymore.
Kimmo Varis [Mon, 31 Dec 2007 20:24:48 +0000 (20:24 +0000)]
Docs: Explain fastest way to improve translation by editing PO file in WinMerge program folder.
Kimmo Varis [Mon, 31 Dec 2007 19:55:53 +0000 (19:55 +0000)]
Docs: Reflow Translations.html to not have over 80 char lines (except links). No content changes.
Tim Gerundt [Sat, 29 Dec 2007 16:03:57 +0000 (16:03 +0000)]
Add SVN properties to new file editlib\powershell.cpp
Tim Gerundt [Sat, 29 Dec 2007 15:18:56 +0000 (15:18 +0000)]
PATCH: [
1859657 ] PowerShell syntax highlighter
Tim Gerundt [Sun, 23 Dec 2007 22:02:30 +0000 (22:02 +0000)]
Web: Add "DllBuild 0026" from 7-Zip plugin to web site.
Jochen Tucht [Sun, 23 Dec 2007 16:51:05 +0000 (16:51 +0000)]
- Fix Merge7z UI lang for new translation system
- Change recommended version of 7-Zip to 4.57
Jochen Tucht [Sun, 23 Dec 2007 15:24:30 +0000 (15:24 +0000)]
Merge7z DllBuild 0026 / Support 7z457
Jochen Tucht [Sun, 23 Dec 2007 12:39:30 +0000 (12:39 +0000)]
Merge7z DllBuild 0026 / Support 7z457
Jochen Tucht [Sun, 23 Dec 2007 12:38:08 +0000 (12:38 +0000)]
Merge7z DllBuild 0026 / Support 7z457
Tim Gerundt [Sun, 23 Dec 2007 00:21:56 +0000 (00:21 +0000)]
Web: Add own 404 error page.
Kimmo Varis [Thu, 20 Dec 2007 18:35:41 +0000 (18:35 +0000)]
WinMerge experimental release 2.7.7.1 (SVN revision 4842)
Kimmo Varis [Thu, 20 Dec 2007 17:09:04 +0000 (17:09 +0000)]
Manual: bump version to 1.3.8
Kimmo Varis [Thu, 20 Dec 2007 17:02:10 +0000 (17:02 +0000)]
BUG: [
1748940 ] LineDiff: WinMerge 2.7.4.0 shows difference wrong
Tim Gerundt [Wed, 19 Dec 2007 20:31:30 +0000 (20:31 +0000)]
Web: Colorize Translations Status table
Kimmo Varis [Wed, 19 Dec 2007 16:42:52 +0000 (16:42 +0000)]
PATCH: [
1853409 ] Installer: Remove documents category
Tim Gerundt [Tue, 18 Dec 2007 21:59:26 +0000 (21:59 +0000)]
PATCH: [
1852675 ] Add "Known Issues" to Release Notes
Kimmo Varis [Tue, 18 Dec 2007 16:25:49 +0000 (16:25 +0000)]
PATCH: [
1852599 ] Install Release Notes
Kimmo Varis [Tue, 18 Dec 2007 16:23:56 +0000 (16:23 +0000)]
PATCH: [
1852534 ] Add Release Notes to Help-menu
Kimmo Varis [Mon, 17 Dec 2007 17:29:32 +0000 (17:29 +0000)]
BuildScript: copy ReleaseNotes.html to Docs-folder.
Kimmo Varis [Mon, 17 Dec 2007 16:33:16 +0000 (16:33 +0000)]
PATCH: [
1851921 ] Add option to preserve original file time in file compare
Kimmo Varis [Sun, 16 Dec 2007 11:42:49 +0000 (11:42 +0000)]
PATCH: [
1851283 ] Manual: Remove What Is New
Kimmo Varis [Sun, 16 Dec 2007 09:43:53 +0000 (09:43 +0000)]
PATCH: [
1851308 ] Release notes in HTML format
Kimmo Varis [Sun, 16 Dec 2007 09:22:06 +0000 (09:22 +0000)]
Fix commment.
Kimmo Varis [Sat, 15 Dec 2007 13:40:52 +0000 (13:40 +0000)]
Docs: Small cleanup to readme-developers.