OSDN Git Service
Kimmo Varis [Wed, 8 Jun 2005 19:51:53 +0000 (19:51 +0000)]
PATCH: [
1213649 ] Add copyconstructor to (Diff)FileInfo
Perry Rapp [Wed, 8 Jun 2005 17:38:13 +0000 (17:38 +0000)]
2005-06-08 Perry
PATCH: [
1213238 ] noninteractive switch
Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
Kimmo Varis [Wed, 8 Jun 2005 15:19:27 +0000 (15:19 +0000)]
WinMerge experimental release 2.3.3.5 (cvs)
Kimmo Varis [Wed, 8 Jun 2005 15:11:09 +0000 (15:11 +0000)]
BUG: [
1216821 ] Untitled buffers, Save doesn't work
Kimmo Varis [Wed, 8 Jun 2005 13:58:04 +0000 (13:58 +0000)]
PATCH: [
1216706 ] Ignore case for project file file-extension
Perry Rapp [Wed, 8 Jun 2005 13:08:44 +0000 (13:08 +0000)]
2005-06-08 Perry
Remove nonexistent stampver.inf from Merge.dsp
(No patch because sourceforge.net is unresponsive)
Src: Merge.dsp
Kimmo Varis [Tue, 7 Jun 2005 20:58:32 +0000 (20:58 +0000)]
PATCH: [
1216033 ] Options to enable/disable multiple compare documents
Kimmo Varis [Mon, 6 Jun 2005 15:50:17 +0000 (15:50 +0000)]
PATCH: [
1215235 ] Allow removing items from comboboxes
Tim Gerundt [Sun, 5 Jun 2005 19:29:06 +0000 (19:29 +0000)]
RFE: [
1203923 ] New refresh icon
Kimmo Varis [Sun, 5 Jun 2005 16:45:12 +0000 (16:45 +0000)]
PATCH: [
1214575 ] Add 'Delete' item for dir compare main menu
Jochen Tucht [Sun, 5 Jun 2005 13:52:31 +0000 (13:52 +0000)]
Support 7-Zip 4.20
Jochen Tucht [Sun, 5 Jun 2005 13:44:24 +0000 (13:44 +0000)]
*** empty log message ***
Kimmo Varis [Sat, 4 Jun 2005 08:20:49 +0000 (08:20 +0000)]
PATCH: [
1214575 ] Add 'Delete' item for dir compare main menu
Kimmo Varis [Sat, 4 Jun 2005 07:18:08 +0000 (07:18 +0000)]
PaTCH: [
1214505 ] Installer: Assoc Projectfiles to WinMerge app
Tim Gerundt [Thu, 2 Jun 2005 21:26:54 +0000 (21:26 +0000)]
RFE: [
1017179 ] Plugin readme's as HTML?
Perry Rapp [Thu, 2 Jun 2005 15:39:36 +0000 (15:39 +0000)]
2005-06-02 Perry
PATCH: [
1213161 ] Set return code based on last diff result
Src: DirDoc.cpp Merge.cpp Merge.h MergeDoc.cpp
Tim Gerundt [Wed, 1 Jun 2005 21:04:43 +0000 (21:04 +0000)]
Change email from Korean translator (Sukjoon)
Tim Gerundt [Wed, 1 Jun 2005 20:50:38 +0000 (20:50 +0000)]
PATCH: [
1213019 ] Website changes for new stable release 2.2.4
Perry Rapp [Wed, 1 Jun 2005 20:46:48 +0000 (20:46 +0000)]
2005-06-01 Perry
Add commenting & array bounds checking to CMergeApp::LoadProjectFile
Src: Merge.cpp
Kimmo Varis [Wed, 1 Jun 2005 20:41:42 +0000 (20:41 +0000)]
PATCH: [
1210059 ] Sanity check difference before merging it
Perry Rapp [Tue, 31 May 2005 17:38:24 +0000 (17:38 +0000)]
BUG: [
1209386 ] Comparing by quick differences jams WinMerge
Src: ByteComparator.cpp
Perry Rapp [Tue, 31 May 2005 16:11:57 +0000 (16:11 +0000)]
2005-05-31 Perry
PATCH: [
1206727 ] decouple codepage module from options files
Src: codepage.cpp codepage.h MainFrm.cpp MainFrm.h
Src/Common: LanguageSelect.cpp
Kimmo Varis [Fri, 27 May 2005 14:55:05 +0000 (14:55 +0000)]
PATCH: [
1209294 ] Remove running stampver-tool post-build
Kimmo Varis [Thu, 26 May 2005 18:37:10 +0000 (18:37 +0000)]
BUG: [
1208504 ] Newer right file marked identical comparing by modified date
Kimmo Varis [Thu, 26 May 2005 17:22:24 +0000 (17:22 +0000)]
BUG: [
1198263 ] MergeKorean translation credit wrong?
Kimmo Varis [Thu, 26 May 2005 16:50:25 +0000 (16:50 +0000)]
BUG: [
1201463 ] Prediffer submenu looks broken
Jochen Tucht [Thu, 26 May 2005 16:12:14 +0000 (16:12 +0000)]
no message
Jochen Tucht [Thu, 26 May 2005 16:07:23 +0000 (16:07 +0000)]
Patch [
1191248] Merge7zInstaller update
Jochen Tucht [Thu, 26 May 2005 16:04:55 +0000 (16:04 +0000)]
Patch [
1191245] Merge7z DllBuild 0011
Kimmo Varis [Thu, 26 May 2005 15:52:07 +0000 (15:52 +0000)]
PATCH: [
1208801 ] SetFilter() must set default filter in error case
Tim Gerundt [Thu, 26 May 2005 15:03:47 +0000 (15:03 +0000)]
RFE: [
1203533 ] Web: Reword word-diff feature in features-list
Kimmo Varis [Thu, 26 May 2005 14:15:09 +0000 (14:15 +0000)]
PATCH: [
1208537 ] Small cleanup for CDirView::OpenSelection()
Kimmo Varis [Thu, 26 May 2005 13:53:19 +0000 (13:53 +0000)]
PATCH: [
1208651 ] Manual: Clarify codepage selection is load-time
Kimmo Varis [Thu, 26 May 2005 13:46:31 +0000 (13:46 +0000)]
PATCH: [
1208641 ] Manual: update for opening archive files
Kimmo Varis [Wed, 25 May 2005 15:12:06 +0000 (15:12 +0000)]
Remove unused strings from CDirView::GetItemFileNames()
Kimmo Varis [Wed, 25 May 2005 14:58:46 +0000 (14:58 +0000)]
PATCH: [
1208022 ] Manual: Improve archive support installation docs
Kimmo Varis [Wed, 25 May 2005 14:48:18 +0000 (14:48 +0000)]
PATCH: [
1207820 ] Remove non-const GetPath() from PathContext
Perry Rapp [Wed, 25 May 2005 00:14:21 +0000 (00:14 +0000)]
2005-05-25 Perry
PATCH: [
1206753 ] Make SaveClosing dialog resizable
Src: Merge.rc SaveClosingDlg.cpp SaveClosingDlg.h
Perry Rapp [Wed, 25 May 2005 00:10:01 +0000 (00:10 +0000)]
PATCH: [
1208198 ] Update CMoveConstraint with settable grip
Src/Common: CMoveConstraint.cpp CMoveConstraint.h
Perry Rapp [Tue, 24 May 2005 23:41:35 +0000 (23:41 +0000)]
PATCH: [
1208198 ] Update CMoveConstraint with settable grip
Src/Common: CMoveConstraint.cpp CMoveConstraint.h
Perry Rapp [Tue, 24 May 2005 14:28:11 +0000 (14:28 +0000)]
PATCH: [
1206730 ] Remove meaningless comments on includes in Splash.cpp
Src: Splash.cpp
Perry Rapp [Tue, 24 May 2005 14:26:31 +0000 (14:26 +0000)]
PATCH: [
1206734 ] Remove unneeded include from FilepathEdit.cpp
Src: FilepathEdit.cpp
Perry Rapp [Tue, 24 May 2005 14:07:23 +0000 (14:07 +0000)]
PATCH: [
1206755 ] Remove unneeded include from ColorButton.cpp
Src: ColorButton.cpp
Perry Rapp [Tue, 24 May 2005 14:03:51 +0000 (14:03 +0000)]
BUG: [
1207417 ] Two GetDocument() functions in CDirView
Cosmetic: Added explanatory comment per discussion
Src: DirView.h
Kimmo Varis [Tue, 24 May 2005 12:46:24 +0000 (12:46 +0000)]
PATCH: [
1207228 ] Manual: Users should reboot after installing shell extension
Perry Rapp [Tue, 24 May 2005 02:48:42 +0000 (02:48 +0000)]
PATCH: [
1206732 ] Remove unneeded include from VssPrompt.cpp
Src: VssPrompt.cpp
Perry Rapp [Tue, 24 May 2005 02:40:06 +0000 (02:40 +0000)]
PATCH: [
1206757 ] Remove unneeded include from DiffViewBar.cpp
Src: DiffViewBar.cpp
Perry Rapp [Tue, 24 May 2005 02:35:44 +0000 (02:35 +0000)]
2005-05-24 Perry
PATCH: [
1206808 ] Store temp filename in variable in FileTransform_Unpacking
Src: FileTransform.cpp
Kimmo Varis [Mon, 23 May 2005 16:51:58 +0000 (16:51 +0000)]
PATCH: [
1206647 ] Add trailing slash to MRU paths
Perry Rapp [Sat, 21 May 2005 19:58:23 +0000 (19:58 +0000)]
2005-05-21 Perry
PATCH [
1206085 ] Translate new options dialog to German
Src/Languages/German: MergeGerman.rc
Perry Rapp [Sat, 21 May 2005 19:41:00 +0000 (19:41 +0000)]
PATCH [
1206256 ] Fix DisplayBinaryFiles plugin to handle unicode files
DisplayBinaryFiles: ChangeLog.txt DisplayBinaryFiles.dsp DisplayBinaryFiles.rc
WinMergeScript.cpp
new files unicheck.cpp & unicheck.h
Perry Rapp [Sat, 21 May 2005 17:28:55 +0000 (17:28 +0000)]
2005-05-21 Perry
PATCH [
1206215 ] Fix DisplayBinaryFiles dll source to compile
BUG [
1206209 ] DisplayBinaryFiles.dll does not compile under MSVC7 (2003)
BUG [
1205960 ] DisplayBinaryFiles code does not compile in debug
Fix compilation for DisplayBinaryFiles, for both MSVC6 (debug) and MSVC7
DisplayBinaryFiles: DisplayBinaryFiles.dsp typeinfoex.h WinMergeScript.cpp
new file ChangeLog.txt
Perry Rapp [Fri, 20 May 2005 22:29:36 +0000 (22:29 +0000)]
2005-05-20 Perry
PATCH: [
1187777 ] New LoadConfig function
Src/Common: OptionsMgr.cpp OptionsMgr.h
Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp MainFrm.h
Merge.rc resource.h
Kimmo Varis [Wed, 18 May 2005 14:58:00 +0000 (14:58 +0000)]
WinMerge experimental release 2.3.3.4 (cvs)
Kimmo Varis [Wed, 18 May 2005 14:39:12 +0000 (14:39 +0000)]
PATCH: [
1203615 ] Fix opening manual from new Options-dialog
Kimmo Varis [Wed, 18 May 2005 14:37:16 +0000 (14:37 +0000)]
PATCH: [
1203680 ] Fix tab adding spaces in unicode builds
Kimmo Varis [Wed, 18 May 2005 14:31:31 +0000 (14:31 +0000)]
PATCH: [
1203680 ] Fix tab adding spaces in unicode builds
Perry Rapp [Wed, 18 May 2005 14:26:48 +0000 (14:26 +0000)]
Note that sourceforge tracker doesn't display tabs.
Docs/Developers/readme-developers.html.
Perry Rapp [Wed, 18 May 2005 14:16:36 +0000 (14:16 +0000)]
Update language count (19->21, three occurrences)
Docs/Developers/readme-developers.html.
Perry Rapp [Wed, 18 May 2005 14:13:06 +0000 (14:13 +0000)]
PATCH: [
1201804 ] Fix anchor & caret in shift-f4 operation
Src: MergeDocLineDiffs.cpp
Src/editlib: ccrystaltextview.h
Perry Rapp [Wed, 18 May 2005 13:49:56 +0000 (13:49 +0000)]
2005-05-18 Perry
PATCH: [
1197969 ] New script to update production version in translations
Src new files: SetResourceVersions.bat SetResourceVersions.wsf
Docs/Developers/readme-developers.html.
Kimmo Varis [Tue, 17 May 2005 16:37:09 +0000 (16:37 +0000)]
Add Swedish ReadMe-Swedish.txt to installer - fix mistake in previous checkin
Kimmo Varis [Tue, 17 May 2005 16:25:26 +0000 (16:25 +0000)]
Add Swedish ReadMe-Swedish.txt to installer
Perry Rapp [Tue, 17 May 2005 16:14:36 +0000 (16:14 +0000)]
2005-05-17 Perry
PATCH: [
1203707 ] tiny code rearrangement for debugging
Src: MergeDoc.cpp
Kimmo Varis [Tue, 17 May 2005 16:10:59 +0000 (16:10 +0000)]
PATCH: [
1201834 ] Remove old readme-translations
Kimmo Varis [Tue, 17 May 2005 16:04:35 +0000 (16:04 +0000)]
PATCH: [
1202813 ] Swedish translated ReadMe.txt
- submitted by Hans Eriksson
Kimmo Varis [Tue, 17 May 2005 13:51:08 +0000 (13:51 +0000)]
PATCH: [
1203079 ] Don't ask about saving files after options change
Kimmo Varis [Mon, 16 May 2005 17:34:39 +0000 (17:34 +0000)]
Add change to DirView.cpp I missed from patch #
1184626 (single instance/multidoc)
Kimmo Varis [Mon, 16 May 2005 16:46:08 +0000 (16:46 +0000)]
PATCH: [
1201945 ] Localization of ShellExtension.dll
Submitted by Takashi Sawanaka
Adds Turkish translation to installer and localizes "OptionalFeatures"
Perry Rapp [Sun, 15 May 2005 18:18:33 +0000 (18:18 +0000)]
PATCH: [
1202060 ] Recognize .lang files as having versioninfo
Src: DiffContext.cpp
Perry Rapp [Sun, 15 May 2005 18:03:32 +0000 (18:03 +0000)]
PATCH: [
1188787 ] New Chinese translation rc file (from PATCH
1183476)
More dialogs, and most of the strings
Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
Tim Gerundt [Sun, 15 May 2005 16:51:33 +0000 (16:51 +0000)]
PATCH: [
1201021 ] Add Turkish to the manual (Locales.xml)
Tim Gerundt [Sun, 15 May 2005 16:44:43 +0000 (16:44 +0000)]
PATCH: [
1201007 ] Web: Status of translations updates
Perry Rapp [Sun, 15 May 2005 03:43:32 +0000 (03:43 +0000)]
2005-05-15 Perry
PATCH: [
1201961 ] Japanese translation update
(version 2, to translate syntax colors)
Src/Languages/Japanese: MergeJapanese.rc
Perry Rapp [Sat, 14 May 2005 19:23:56 +0000 (19:23 +0000)]
BUG: [
1190652 ] warning in cvs code in DirScan.cpp
Src: DirScan.cpp
Perry Rapp [Sat, 14 May 2005 18:58:54 +0000 (18:58 +0000)]
BUG: [
1157554 ] MergeKorean IDD_FILEFILTERS not DIALOGEX
Src/Languages/Korean: MergeKorean.rc
Perry Rapp [Sat, 14 May 2005 18:51:10 +0000 (18:51 +0000)]
BUG: [
1162653 ] CMainFrame::ShowVSSError doesn't always log error
Src: MainFrm.cpp
Perry Rapp [Sat, 14 May 2005 17:00:19 +0000 (17:00 +0000)]
PATCH: [
1201961 ] Japanese translation update
Src/Languages/Japanese: MergeJapanese.rc
Perry Rapp [Sat, 14 May 2005 06:42:15 +0000 (06:42 +0000)]
PATCH: [
1188787 ] New Chinese translation rc file (from PATCH
1183476)
Applied some dialog translations.
Src/Languages: MergeChineseTraditional.rc
Perry Rapp [Sat, 14 May 2005 04:41:43 +0000 (04:41 +0000)]
(Copy update note from this readme to Docs/Users/Manual/readme.txt
for patch
1199600)
Perry Rapp [Sat, 14 May 2005 04:23:49 +0000 (04:23 +0000)]
2005-05-14 Perry
PATCH: [
1201703 ] Swedish MergeSwedish.rc update
Src/Languages/MergeSwedish.rc
Kimmo Varis [Fri, 13 May 2005 21:07:31 +0000 (21:07 +0000)]
PATCH: [
1201434 ] New ReadMe.txt
Perry Rapp [Fri, 13 May 2005 17:46:51 +0000 (17:46 +0000)]
Cosmetic: Fix synchro spelling in MergeFrench.rc (one currence LANGAGE => LANGUAGE)
Src/Languages/French: MergeFrench.rc
Perry Rapp [Fri, 13 May 2005 16:17:15 +0000 (16:17 +0000)]
Cosmetic: Expand header comments on GetScriptsSubmenu & GetPrediffersSubmenu
Src: MainFrm.cpp
Perry Rapp [Fri, 13 May 2005 04:23:17 +0000 (04:23 +0000)]
PATCH: [
1201130 ] Fix prediffers menu for multiple menu brokenness
Src: MainFrm.cpp
Perry Rapp [Fri, 13 May 2005 03:52:51 +0000 (03:52 +0000)]
PATCH: [
1201125 ] Add checking to AppendMenu calls in building prediffer subme
Src: MergeEditView.cpp
Perry Rapp [Fri, 13 May 2005 01:11:36 +0000 (01:11 +0000)]
BUG: [
1197964 ] MergeBulgarian string versioninfo translated
Added English/1252 section to Bulgarian, as MergeCatalan has.
(Adding English/1251 section did not work on US Windows system.)
Src/Languages/Bulgarian: MergeBulgarian.rc
Perry Rapp [Fri, 13 May 2005 00:34:29 +0000 (00:34 +0000)]
2005-05-13 Perry
PATCH: [
1201029 ] Catalan translation update
Src/Languages/Catalan: MergeCatalan.rc
Kimmo Varis [Thu, 12 May 2005 21:35:16 +0000 (21:35 +0000)]
PATCH: [
1199889 ] Ask to save modified files before creating a patch
Tim Gerundt [Thu, 12 May 2005 17:37:59 +0000 (17:37 +0000)]
BUG: [
1199609 ] New File Compare method for docs
Kimmo Varis [Thu, 12 May 2005 17:17:55 +0000 (17:17 +0000)]
BUG: [
1198435 ] Comma missing from ID_LOCBAR_GOTODIFF menuitem
Perry Rapp [Thu, 12 May 2005 01:35:33 +0000 (01:35 +0000)]
2005-05-12 Perry
PATCH: [
1199600 ] Minor update to text encoding docs in manual
Docs/Users/Manual: Text_encoding.xml
Kimmo Varis [Wed, 11 May 2005 19:15:12 +0000 (19:15 +0000)]
PATCH: [
1199194 ] Optimization for difflist
- Additional change to properly handle empty difflist
Kimmo Varis [Wed, 11 May 2005 17:06:47 +0000 (17:06 +0000)]
Update Contributors list
Kimmo Varis [Wed, 11 May 2005 17:02:15 +0000 (17:02 +0000)]
Options are now initialized in CMainFrame::OptionsInit() in OptionsInit.cpp
Kimmo Varis [Wed, 11 May 2005 16:51:33 +0000 (16:51 +0000)]
Update UpdateAll_resource_h.bat to update Turkish too
Kimmo Varis [Wed, 11 May 2005 16:45:20 +0000 (16:45 +0000)]
PATCH: [
1198955 ] Discard all button on Save modified pane
- submitted by Ferenc Kubatovics
Kimmo Varis [Wed, 11 May 2005 16:45:00 +0000 (16:45 +0000)]
Update UpdateAll_resource_h.bat to update Turkish too
Kimmo Varis [Wed, 11 May 2005 15:55:36 +0000 (15:55 +0000)]
PATCH: [
1199194 ] Optimization for difflist
Perry Rapp [Wed, 11 May 2005 05:39:25 +0000 (05:39 +0000)]
Improve comments heading & in OlecharToUTF8
Src/Common: multiformatText.cpp