OSDN Git Service
Perry Rapp [Sat, 5 Mar 2005 17:38:00 +0000 (17:38 +0000)]
PATCH: [
1157145 ] FileFilterHelper doesn't have boilerplate new redefinition
Src: FileFilterHelper.cpp
Perry Rapp [Sat, 5 Mar 2005 07:23:22 +0000 (07:23 +0000)]
PATCH: [
1157015 ] Spanish translation update
Lots of updates to Spanish translation by Jesus M. Delgado 'Mack'
Src/Languages/Spanish: MergeSpanish.rc
Perry Rapp [Sat, 5 Mar 2005 06:34:53 +0000 (06:34 +0000)]
BUG: [
1153184 ] DiffWrapper.cpp missing NEW redefinition
Added boilerplate new redefintion for DEBUG builds to DiffWrapper.cpp
Src: DiffWrapper.cpp
Perry Rapp [Sat, 5 Mar 2005 06:23:28 +0000 (06:23 +0000)]
Rename FilterHelper's GetUseMask to IsUsingMask.
Src: FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp
Perry Rapp [Sat, 5 Mar 2005 06:20:45 +0000 (06:20 +0000)]
More filter clarifying renames
Src: DirDoc.cpp FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp
Perry Rapp [Sat, 5 Mar 2005 06:12:58 +0000 (06:12 +0000)]
2005-03-05 Perry
Rename CDirFrame::SetFilter to CDirFrame::SetFilterStatusDisplay for easier greps.
Src: DirDoc.cpp DirFrame.cpp DirFrame.h
Perry Rapp [Sat, 5 Mar 2005 00:49:58 +0000 (00:49 +0000)]
PATCH: [
1112871 ] new byte_compare function to bypass diffutils
Src: DiffContext.h DiffWrapper.cpp DiffWrapper.h DirDoc.cpp DirScan.cpp Merge.dsp
Src new files: ByteComparator.cpp ByteComparator.h
Perry Rapp [Sat, 5 Mar 2005 00:21:44 +0000 (00:21 +0000)]
PATCH: [
1112871 ] new byte_compare function to bypass diffutils
Src: DiffContext.h DiffWrapper.cpp DiffWrapper.h DirDoc.cpp DirScan.cpp Merge.dsp
Src new files: ByteComparator.cpp ByteComparator.h
Perry Rapp [Fri, 4 Mar 2005 18:57:25 +0000 (18:57 +0000)]
2005-03-04 Perry
PATCH: [
1147039 ] experimental patch for colored word diff
Merge all the easy new Japanese string translations
(Omit major changes to IDD_PROPPAGE_EDITOR & IDD_MERGE7ZMISMATCH.
Languages: Japanese/MergeJapanese.rc
Kimmo Varis [Fri, 4 Mar 2005 13:39:42 +0000 (13:39 +0000)]
PATCH: [
1147039 ] experimental patch for colored word diff
- submitted by Takashi Sawanaka
Kimmo Varis [Fri, 4 Mar 2005 09:15:51 +0000 (09:15 +0000)]
PATCH: [
1156188 ] Updated readme-innosetup
Kimmo Varis [Fri, 4 Mar 2005 08:58:21 +0000 (08:58 +0000)]
PATCH: [
1155436 ] Remove non-const GetDiffAt() from CDiffContext
Kimmo Varis [Fri, 4 Mar 2005 08:21:23 +0000 (08:21 +0000)]
PATCH: [
1155319 ] Select font for dir compare view
- we must allow selecting file compare font even if no open views
Perry Rapp [Fri, 4 Mar 2005 02:20:58 +0000 (02:20 +0000)]
2005-03-04 Perry
PATCH: [
1156253 ] Fix filter helper handling of new filters
BUG: [
1153018 ] Create new filter, now cannot find it
Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp Merge.cpp
Merge.h paths.cpp paths.h
Kimmo Varis [Thu, 3 Mar 2005 18:22:47 +0000 (18:22 +0000)]
PATCH: [
1154667 ] Make CDiffContext paths private members
Kimmo Varis [Thu, 3 Mar 2005 17:15:45 +0000 (17:15 +0000)]
PATCH: [
1155319 ] Select font for dir compare view
Perry Rapp [Thu, 3 Mar 2005 15:42:45 +0000 (15:42 +0000)]
2005-03-03 Perry
Fix typo ("for" => "four")
Manual: Text_encoding.xml
Perry Rapp [Thu, 3 Mar 2005 15:31:31 +0000 (15:31 +0000)]
2005-03-02 Perry
PATCH: [
1154259 ] Non blurred 'error.bmp'
New clearer error bitmap from Tim Gerundt
Languages: res/error.bmp
Perry Rapp [Thu, 3 Mar 2005 06:37:46 +0000 (06:37 +0000)]
2005-03-03 Perry
PATCH: [
1151951 ] Alter getRightFilepath for root paths
re: BUG: [
1105933 ] Problem accessing files in network shares and removables
Src: DiffContext.cpp
Kimmo Varis [Wed, 2 Mar 2005 21:31:53 +0000 (21:31 +0000)]
BUG: [ 975226 ] Editor: Always refresh with Del-Key
- fix submitted by Takashi Sawanaka
Perry Rapp [Wed, 2 Mar 2005 03:55:25 +0000 (03:55 +0000)]
PATCH: [ 967230 ] Initialize default language from locale
Src/Common: LanguageSelect.cpp LanguageSelect.h
Perry Rapp [Wed, 2 Mar 2005 03:38:12 +0000 (03:38 +0000)]
PATCH: [
1153127 ] Rename Filepath to FilepathWithEncoding
Src: DiffWrapper.cpp DiffWrapper.h
Perry Rapp [Wed, 2 Mar 2005 03:34:16 +0000 (03:34 +0000)]
PATCH: [
1154259 ] Non blurred 'error.bmp'
New clearer error bitmap from Tim Gerundt
Src/Res: error.bmp
Kimmo Varis [Tue, 1 Mar 2005 15:38:17 +0000 (15:38 +0000)]
WinMerge experimental release 2.3.1.5 (cvs)
Kimmo Varis [Tue, 1 Mar 2005 15:26:28 +0000 (15:26 +0000)]
PATCH: [
1153905 ] Doc: Update installation help for Merge7zInstaller
Kimmo Varis [Tue, 1 Mar 2005 15:23:06 +0000 (15:23 +0000)]
PATCH: [
1153870 ] Disable redrawing dir compare view while adding items
Kimmo Varis [Tue, 1 Mar 2005 15:20:29 +0000 (15:20 +0000)]
PATCH: [
1153851 ] Remove Merge7z*.dll install from installer
Jochen Tucht [Tue, 1 Mar 2005 06:49:33 +0000 (06:49 +0000)]
Patches [
1152341], [
1152469]
Jochen Tucht [Tue, 1 Mar 2005 06:41:35 +0000 (06:41 +0000)]
Patch [
1152469] Add Merge7zInstaller download link
Jochen Tucht [Tue, 1 Mar 2005 06:34:21 +0000 (06:34 +0000)]
Patch [
1152341] Merge7z update (DllBuild_Merge7z_10)
Perry Rapp [Mon, 28 Feb 2005 22:51:59 +0000 (22:51 +0000)]
BUG: [ 895732 ] paths_GetLongPath usually ignores 2nd parameter
Remove 2nd parameter entirely from paths_GetLongPath, and improve documentation.
Src: Merge.cpp OpenDlg.cpp paths.cpp paths.h readme.txt
Kimmo Varis [Mon, 28 Feb 2005 20:39:15 +0000 (20:39 +0000)]
PATCH: [
1144545 ] Project Handling Patch3 (remember last valid project path)
- submitted by Andreas Morsing
Kimmo Varis [Mon, 28 Feb 2005 17:11:35 +0000 (17:11 +0000)]
PATCH: [
1153091 ] Fix selecting default font from View menu
Perry Rapp [Mon, 28 Feb 2005 14:56:49 +0000 (14:56 +0000)]
BUG: [
1039158 ] Confusing EOL differences messagebox
Perry Rapp [Mon, 28 Feb 2005 00:15:23 +0000 (00:15 +0000)]
PATCH: [ 925085 ] Propose failing files 2gigs+ in size
Src/Common: UniFile.cpp
Perry Rapp [Sun, 27 Feb 2005 23:59:26 +0000 (23:59 +0000)]
BUG [
1144425 ] German: Options/codepage dlg needs adjust
(Fix by Tim Gerundt)
Perry Rapp [Sun, 27 Feb 2005 23:23:08 +0000 (23:23 +0000)]
PATCH: [
1112636 ] Suggest cosmetic change in DiffFileData::OpenFiles
(new method DiffFileData::Filepath::AssignPath)
Kimmo Varis [Sun, 27 Feb 2005 23:15:42 +0000 (23:15 +0000)]
BUG: [
1153017 ] FileFilterHelper::SetFilter ASSERTS on empty string
Perry Rapp [Sun, 27 Feb 2005 22:47:57 +0000 (22:47 +0000)]
BUG: [
1152911 ] CListCtrlEx::Dump is an infinite loop.
Perry Rapp [Sun, 27 Feb 2005 19:48:55 +0000 (19:48 +0000)]
Cosmetic: Add more explanation to function header of
FileFilterHelper::LoadFileFilterDirPattern.
Perry Rapp [Sun, 27 Feb 2005 19:06:21 +0000 (19:06 +0000)]
BUG: [
1038897 ] Weird comment in DiffWrapper.cpp
cosmetic: removing obsolete comment, improving existing comments
Perry Rapp [Sun, 27 Feb 2005 18:03:43 +0000 (18:03 +0000)]
PATCH: [
1152967 ] Fix re_match_2 declaration warnings
Perry Rapp [Sun, 27 Feb 2005 17:53:06 +0000 (17:53 +0000)]
BUG: [
1152913 ] LocationView type bugs?
(Fixed 17 type conversion warnings in MSVC.NET 2003, mostly by explicit casts)
Jochen Tucht [Sat, 26 Feb 2005 16:55:48 +0000 (16:55 +0000)]
Attempt to fix bug [
1152375] 'Help -> Archive Support disabled' broken
Jochen Tucht [Sat, 26 Feb 2005 14:13:28 +0000 (14:13 +0000)]
Explain release filename convention
Jochen Tucht [Sat, 26 Feb 2005 10:08:51 +0000 (10:08 +0000)]
Patch [
1152256] UniFile may fail to read last line
Perry Rapp [Sat, 26 Feb 2005 06:49:41 +0000 (06:49 +0000)]
PATCH: [
1151949 ] Fix CDirDoc::FindItemFromPaths for root
Tim Gerundt [Fri, 25 Feb 2005 22:42:11 +0000 (22:42 +0000)]
PATCH: [
1151385 ] Compile instructions for Merge7zInstaller
Perry Rapp [Wed, 23 Feb 2005 21:28:30 +0000 (21:28 +0000)]
PATCH: [
1145016 ] i18n the version control strings
Src: Merge.rc PropVss.cpp PropVss.h resource.h
Languages: resource.h Merge*.rc
Kimmo Varis [Wed, 23 Feb 2005 18:13:31 +0000 (18:13 +0000)]
2005-02-23 WinMerge experimental release 2.3.1.4 (cvs)
Kimmo Varis [Wed, 23 Feb 2005 18:10:15 +0000 (18:10 +0000)]
PATCH: [
1145560 ] Docs: Add link to updated developer-pages
Kimmo Varis [Wed, 23 Feb 2005 18:05:20 +0000 (18:05 +0000)]
Add compiler-selecting ifdef to Unifile.cpp to make it compile with MSVC6 and MSVC7
Kimmo Varis [Wed, 23 Feb 2005 17:49:20 +0000 (17:49 +0000)]
PATCH: [
1149388 ] Check for previous compare text before find again
Kimmo Varis [Wed, 23 Feb 2005 17:45:32 +0000 (17:45 +0000)]
PATCH: [
1149365 ] Check linenumber to goto for upper limit
Kimmo Varis [Wed, 23 Feb 2005 17:41:34 +0000 (17:41 +0000)]
PATCH: [
1149081 ] Invalid string compare in CChildFrm.cpp
Tim Gerundt [Tue, 22 Feb 2005 20:16:53 +0000 (20:16 +0000)]
Some margin updates
Kimmo Varis [Tue, 22 Feb 2005 20:01:56 +0000 (20:01 +0000)]
Improve markup (menuchoice around menu selection)
Kimmo Varis [Tue, 22 Feb 2005 19:59:45 +0000 (19:59 +0000)]
Fix markup and typo
Kimmo Varis [Tue, 22 Feb 2005 17:49:19 +0000 (17:49 +0000)]
BUG: [
1144580 ] markdown.cpp compile error with VS 2003
- fix from Jochen
Kimmo Varis [Tue, 22 Feb 2005 17:35:56 +0000 (17:35 +0000)]
PATCH: [
1145522 ] fix crash on search
- submitted by Takashi Sawanaka
Perry Rapp [Tue, 22 Feb 2005 07:04:00 +0000 (07:04 +0000)]
2005-02-22 Perry
Minor grammar proofing
Manual: Whatsnew_2_1.xml
Perry Rapp [Tue, 22 Feb 2005 06:58:12 +0000 (06:58 +0000)]
2005-02-22 Perry
Minor grammar proofing
Manual: Open_paths.xml
Perry Rapp [Tue, 22 Feb 2005 06:54:13 +0000 (06:54 +0000)]
2005-02-22 Perry
Proofing (grammatical fixes)
Manual: Locales.xml
Perry Rapp [Tue, 22 Feb 2005 06:50:53 +0000 (06:50 +0000)]
2005-02-22 Perry
Rewrite translation coverage paragram
Manual: Locales.xml
Kimmo Varis [Mon, 21 Feb 2005 21:01:09 +0000 (21:01 +0000)]
Fix some typos
Kimmo Varis [Mon, 21 Feb 2005 17:27:28 +0000 (17:27 +0000)]
Update Docbook instructions in devel doc (path changed in sf.net)
Perry Rapp [Sun, 20 Feb 2005 22:51:51 +0000 (22:51 +0000)]
BUG [
1144978 ] No languages available in development
Fix CopyAll.bat, and cosmetic changes to LanguageSelect.*
Tim Gerundt [Sun, 20 Feb 2005 21:41:39 +0000 (21:41 +0000)]
Fix 'cliboard' typo in rc files.
Tim Gerundt [Sun, 20 Feb 2005 20:13:31 +0000 (20:13 +0000)]
RFE: [
1144136 ] Web: Add 2.3 for translations status table
Tim Gerundt [Sun, 20 Feb 2005 20:05:29 +0000 (20:05 +0000)]
PATCH: [
1144726 ] Web: Updated Developer instructions
Perry Rapp [Sun, 20 Feb 2005 19:17:16 +0000 (19:17 +0000)]
BUG: [
1144917 ] cvs source does not compile: '_stati64' : undeclared identif
Fix ANSI compilation of stati64
Src/Common: UniFile.cpp
Kimmo Varis [Sun, 20 Feb 2005 15:46:49 +0000 (15:46 +0000)]
PATCH: [
1144624 ] Docs: Better instructions for installing translations
- update for 2.3 Languages subdirectory
Kimmo Varis [Sun, 20 Feb 2005 13:59:33 +0000 (13:59 +0000)]
PATCH: [
1144624 ] Docs: Better instructions for installing translations
Kimmo Varis [Sun, 20 Feb 2005 13:21:50 +0000 (13:21 +0000)]
PATCH: [
1144588 ] Remove show bak files setting from configlog
Kimmo Varis [Sat, 19 Feb 2005 23:23:42 +0000 (23:23 +0000)]
Add typecast for VC6
Kimmo Varis [Sat, 19 Feb 2005 23:13:19 +0000 (23:13 +0000)]
Add typecast for VC6
Kimmo Varis [Sat, 19 Feb 2005 23:09:02 +0000 (23:09 +0000)]
Fix compile error in MainFrm.cpp
Kimmo Varis [Sat, 19 Feb 2005 14:55:27 +0000 (14:55 +0000)]
PATCH: [
1144059 ] Allow getting filestatus from open file in UniXXXFile
Tim Gerundt [Fri, 18 Feb 2005 22:47:14 +0000 (22:47 +0000)]
PATCH: [
1144106 ] Web: Highlight CSS class 'important'
Kimmo Varis [Fri, 18 Feb 2005 21:50:33 +0000 (21:50 +0000)]
PATCH: [
1124475 ] Update of the swedish translation
- submitted by Hans Eriksson
Tim Gerundt [Fri, 18 Feb 2005 20:11:15 +0000 (20:11 +0000)]
PATCH: [
1064389 ] Web: Switch easier between versions
Kimmo Varis [Thu, 17 Feb 2005 20:30:04 +0000 (20:30 +0000)]
PATCH: [
1124380 ] Use _tstati64() in UniLocalFile::DoGetFileStatus()
Kimmo Varis [Wed, 16 Feb 2005 16:22:30 +0000 (16:22 +0000)]
PATCH: [
1123539 ] Small improvement for code creating backup copy
Kimmo Varis [Tue, 15 Feb 2005 21:35:49 +0000 (21:35 +0000)]
PATCH: [
1122740 ] Docs: Better introductory chapter
Kimmo Varis [Tue, 15 Feb 2005 21:17:58 +0000 (21:17 +0000)]
PATCH: [
1122703 ] Docs: New faq item about printing
Kimmo Varis [Tue, 15 Feb 2005 21:16:00 +0000 (21:16 +0000)]
PaTCH: [
1122699 ] Docs: Missing Hungarian translation, info about translations
Kimmo Varis [Mon, 14 Feb 2005 22:32:54 +0000 (22:32 +0000)]
PATCH: [
1121779 ] Uninstall new filters too
Kimmo Varis [Sun, 13 Feb 2005 13:26:34 +0000 (13:26 +0000)]
PATCH: [
1121582 ] Install file filter template
Kimmo Varis [Sun, 13 Feb 2005 00:26:46 +0000 (00:26 +0000)]
PATCH: [
1118261 ] Allow creating and deleting filefilters from UI
Kimmo Varis [Sun, 13 Feb 2005 00:17:43 +0000 (00:17 +0000)]
PATCH: [
1118261 ] Allow creating and deleting filefilters from UI
Kimmo Varis [Fri, 11 Feb 2005 21:01:43 +0000 (21:01 +0000)]
Replace nickname with real name.
Kimmo Varis [Thu, 10 Feb 2005 23:10:35 +0000 (23:10 +0000)]
PATCH: [
1116778 ] Project Handling patch
- submitted by Schlundus
Tim Gerundt [Tue, 8 Feb 2005 19:55:19 +0000 (19:55 +0000)]
PATCH: [
1116828 ] Web: New layout for header (h1)
Kimmo Varis [Mon, 7 Feb 2005 17:52:01 +0000 (17:52 +0000)]
PATCH: [
1117375 ] Rememer status/toolbar visible status
Kimmo Varis [Mon, 7 Feb 2005 16:40:37 +0000 (16:40 +0000)]
RFE: [
1116010 ] Smaller default font
Jochen Tucht [Sat, 5 Feb 2005 17:47:23 +0000 (17:47 +0000)]
no message
Jochen Tucht [Sat, 5 Feb 2005 17:42:05 +0000 (17:42 +0000)]
no message
Jochen Tucht [Sat, 5 Feb 2005 11:23:49 +0000 (11:23 +0000)]
patch [
1107467] Detect 7-Zip version from 7zip_pad.xml (2)
Tim Gerundt [Fri, 4 Feb 2005 17:14:39 +0000 (17:14 +0000)]
PATCH: [
1115079 ] Web: Switch from TABLE to CSS layout
Kimmo Varis [Thu, 3 Feb 2005 17:21:41 +0000 (17:21 +0000)]
PATCH: [
1114360 ] Non-blocking file filter editing