OSDN Git Service
Kimmo Varis [Mon, 4 Feb 2008 19:02:38 +0000 (19:02 +0000)]
Convert shared/private file filter selection dialog to use COptionsMgr instead of accessing registry directly.
Kimmo Varis [Mon, 4 Feb 2008 10:06:53 +0000 (10:06 +0000)]
Remove commented out code.
Kimmo Varis [Sun, 3 Feb 2008 16:12:43 +0000 (16:12 +0000)]
PATCH: [
1884920 ] Add publisher to version resource
Kimmo Varis [Sun, 3 Feb 2008 16:06:18 +0000 (16:06 +0000)]
BUG: [
1878828 ] ShellExtension version resource strings not good
Kimmo Varis [Fri, 1 Feb 2008 14:34:51 +0000 (14:34 +0000)]
BUG: [
1882019 ] Read-only does not disable Delete in main menu
Kimmo Varis [Fri, 1 Feb 2008 14:19:21 +0000 (14:19 +0000)]
PATCH: [
1883868 ] Add document string for CDirDoc
Kimmo Varis [Fri, 1 Feb 2008 14:14:21 +0000 (14:14 +0000)]
PATCH: [
1883044 ] Build for XP with VS2008
Kimmo Varis [Fri, 1 Feb 2008 06:16:55 +0000 (06:16 +0000)]
Fix a typo, standardize to using folder instead of directory.
Jochen Tucht [Thu, 31 Jan 2008 21:49:14 +0000 (21:49 +0000)]
Patch #
1865087 - This fix got lost somehow...
Jochen Tucht [Thu, 31 Jan 2008 21:34:05 +0000 (21:34 +0000)]
CollapseWhitespace() was eating a closing tag's < when tags included nothing but whitespace.
Tim Gerundt [Thu, 31 Jan 2008 21:32:16 +0000 (21:32 +0000)]
PATCH: [
1883059 ] Web: Changes for new stable release 2.6.14
Jochen Tucht [Thu, 31 Jan 2008 21:08:06 +0000 (21:08 +0000)]
Jochen Tucht [Thu, 31 Jan 2008 21:03:44 +0000 (21:03 +0000)]
Fix ANSI build
Kimmo Varis [Thu, 31 Jan 2008 20:23:12 +0000 (20:23 +0000)]
Update root readme.txt, add missing externals folder and update descriptions for several other folders. Update information about changelog.
Kimmo Varis [Thu, 31 Jan 2008 18:51:56 +0000 (18:51 +0000)]
PATCH: [
1821669 ] Build external libraries from WinMerge pre-link step
- apply latest version of Jochen's patch (modified for paths) to fix VS2008 build.
Kimmo Varis [Thu, 31 Jan 2008 16:15:30 +0000 (16:15 +0000)]
PATCH: [
1882897 ] Make options handling safer by using String internally
Kimmo Varis [Wed, 30 Jan 2008 19:33:24 +0000 (19:33 +0000)]
Remove MFC/stdafx.h dependency from TempFile.cpp.
Kimmo Varis [Wed, 30 Jan 2008 17:26:30 +0000 (17:26 +0000)]
Add our current changelog file to project file's Changelogs -folder. Remove old changelog files from project file.
Takashi Sawanaka [Wed, 30 Jan 2008 15:44:05 +0000 (15:44 +0000)]
BUG: [
1881931 ] WM ignores diff of 3 bytes at the head of UTF-8NOBOM file
Tim Gerundt [Tue, 29 Jan 2008 23:13:56 +0000 (23:13 +0000)]
PATCH: [
1882053 ] Delete unused language resources
Tim Gerundt [Tue, 29 Jan 2008 23:10:28 +0000 (23:10 +0000)]
Fix archive bit trick for PO(T) scripts [hopefully finally]
Kimmo Varis [Tue, 29 Jan 2008 15:42:27 +0000 (15:42 +0000)]
Changelog: Ask and create pair for unique folder and open them (#
1881454)
Kimmo Varis [Tue, 29 Jan 2008 15:32:12 +0000 (15:32 +0000)]
PATCH: [
1881454 ] Create pair for unique folder and open them
Tim Gerundt [Mon, 28 Jan 2008 22:08:43 +0000 (22:08 +0000)]
PATCH: [
1869755 ] Use radio symbol for current EOL menu item
Kimmo Varis [Mon, 28 Jan 2008 20:07:15 +0000 (20:07 +0000)]
BUG: [
1854419 ] WinMerge returns "1" upon closing, if files read-only
Kimmo Varis [Mon, 28 Jan 2008 14:13:23 +0000 (14:13 +0000)]
PATCH: [
1880857 ] Open conflict files from command line
Kimmo Varis [Sun, 27 Jan 2008 22:15:16 +0000 (22:15 +0000)]
Remove unused member variable (bool m_readbom) from Uni*File.
Tim Gerundt [Sun, 27 Jan 2008 20:58:13 +0000 (20:58 +0000)]
PATCH: [
1880519 ] Use radio symbol for syntax highlighting menu items
Tim Gerundt [Sun, 27 Jan 2008 20:50:45 +0000 (20:50 +0000)]
PATCH: [
1880516 ] Web: Add "file releases" RSS feed to download page
Kimmo Varis [Sun, 27 Jan 2008 12:39:28 +0000 (12:39 +0000)]
PATCH: [
1880423 ] Check if file is a conflict file before parsing
Revert a change to Merge.cpp which was not a part of this patch.
Kimmo Varis [Sun, 27 Jan 2008 11:50:51 +0000 (11:50 +0000)]
PATCH: [
1880423 ] Check if file is a conflict file before parsing
Takashi Sawanaka [Sun, 27 Jan 2008 04:38:29 +0000 (04:38 +0000)]
Japanese translation - update
Tim Gerundt [Sun, 27 Jan 2008 00:31:15 +0000 (00:31 +0000)]
PATCH: [
1880489 ] Web: Translations status as RSS feed
Kimmo Varis [Sat, 26 Jan 2008 11:23:40 +0000 (11:23 +0000)]
PATCH: [
1879271 ] Detect UTF-8 files without BOM as UTF-8
Add m_bom to UniLocalFile::Clear().
Kimmo Varis [Sat, 26 Jan 2008 11:10:44 +0000 (11:10 +0000)]
Remove some excessive blank lines.
Kimmo Varis [Sat, 26 Jan 2008 00:05:00 +0000 (00:05 +0000)]
PATCH: [
1879271 ] Detect UTF-8 files without BOM as UTF-8
Kimmo Varis [Fri, 25 Jan 2008 20:18:46 +0000 (20:18 +0000)]
Remove unused function from unicoder.cpp/h: GetUnicodesetName().
Tim Gerundt [Thu, 24 Jan 2008 23:23:27 +0000 (23:23 +0000)]
Fix archive bit trick for PO(T) scripts
Tim Gerundt [Thu, 24 Jan 2008 22:15:03 +0000 (22:15 +0000)]
PATCH: [
1879245 ] Delete unused resources
Tim Gerundt [Thu, 24 Jan 2008 21:45:40 +0000 (21:45 +0000)]
RFE: [
1875248 ] Script to check Menu resources
Kimmo Varis [Thu, 24 Jan 2008 21:14:26 +0000 (21:14 +0000)]
PATCH: [
1879032 ] Remove copy-paste encoding detection code
Tim Gerundt [Wed, 23 Jan 2008 22:36:03 +0000 (22:36 +0000)]
Changelog: Add Croatian updates for WinMerge 2.7.7.4
Tim Gerundt [Wed, 23 Jan 2008 22:28:25 +0000 (22:28 +0000)]
Small updates for Croatian translation by Hasan Osmanagæ
Kimmo Varis [Wed, 23 Jan 2008 16:52:27 +0000 (16:52 +0000)]
WinMerge experimental release 2.7.7.3 (SVN revision 4951)
Kimmo Varis [Wed, 23 Jan 2008 16:18:55 +0000 (16:18 +0000)]
PATCH: [
1450646 ] Add some doxygen comments to diff item stuff
Applied only the DiffItem.h changes that still were valid.
Kimmo Varis [Wed, 23 Jan 2008 15:13:15 +0000 (15:13 +0000)]
PATCH: [
1877735 ] Manual: Document third path in command line
Tim Gerundt [Tue, 22 Jan 2008 23:13:10 +0000 (23:13 +0000)]
Update all PO files after RFE #
1699883
Tim Gerundt [Tue, 22 Jan 2008 22:52:17 +0000 (22:52 +0000)]
RFE: [
1699883 ] Add "translation instructions" link to language dialog (now help menu)
Kimmo Varis [Tue, 22 Jan 2008 22:47:39 +0000 (22:47 +0000)]
PATCH: [
1877695 ] VS2005 compile problems: avoid use of 'using namespace std;'
Submitted by Robert Grange
Kimmo Varis [Tue, 22 Jan 2008 17:26:13 +0000 (17:26 +0000)]
PATCH: [
1875129 ] Resolve conflict files
Use string constants in code for conflict markers to not confuse parser when parsing this file.
Kimmo Varis [Tue, 22 Jan 2008 16:54:16 +0000 (16:54 +0000)]
PATCH: [
1875129 ] Resolve conflict files
Set right-side "mine" file as modified after opening it.
Kimmo Varis [Tue, 22 Jan 2008 16:37:27 +0000 (16:37 +0000)]
PATCH: [
1874047 ] Simpler temp file class
Bugfix from Takashi for scratchpads failing to open.
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.