OSDN Git Service
Kimmo Varis [Wed, 23 Nov 2005 18:14:17 +0000 (18:14 +0000)]
WinMerge experimental release 2.5.0.2 (cvs)
Tim Gerundt [Tue, 22 Nov 2005 20:00:20 +0000 (20:00 +0000)]
PATCH: [
1363114 ] Add '*.ctl;*.pag;*.dsr' to Visual Basic highlighter
Kimmo Varis [Tue, 22 Nov 2005 18:32:50 +0000 (18:32 +0000)]
BUG: [
1355884 ] 2.4.2 fails to open dvd files
File/folder selection dialog couldn't open read-only folders
Kimmo Varis [Tue, 22 Nov 2005 17:55:52 +0000 (17:55 +0000)]
PATCH: [
1362882 ] Remove option for autoclosing compare statepane
Perry Rapp [Tue, 22 Nov 2005 03:39:38 +0000 (03:39 +0000)]
BUG: [
1277320 ] Plugins.txt not up-to-date
Plugins/dll/IgnoreCommentsC
Perry Rapp [Tue, 22 Nov 2005 02:50:43 +0000 (02:50 +0000)]
2005-11-21 Perry
PATCH: [
1334589 ] Encoding maps for Expat parser, for DisplayXmlFiles plugin
Plugins\src_VCPP\DisplayXMLFiles altered files:
DisplayXMLFiles.dsp DisplayXMLFiles.rc WinMergeScript.cpp
Plugins\src_VCPP\DisplayXMLFiles new files:
expat_maps.cpp expat_maps.h MakeExpatEncod.rb
map_data_8859*.h (1-11, 13-16)
Plugins\src_VCPP\DisplayXMLFiles\mappings\ISO8859 new files:
8859*.TXT (1-11, 13-16)
Perry Rapp [Tue, 22 Nov 2005 02:34:20 +0000 (02:34 +0000)]
PATCH: [
1334277 ] Show asterisk in #diffs for QuickCompare results
Src: DiffWrapper.cpp DiffWrapper.h DirViewColItems.cpp
Kimmo Varis [Sun, 20 Nov 2005 15:57:43 +0000 (15:57 +0000)]
PATCH: [
1349645 ] Folder Compare Statistics dialog
PATCH: [
1347787 ] Use non-modal dialog for dir compare status
Jochen Tucht [Sat, 19 Nov 2005 15:47:30 +0000 (15:47 +0000)]
Merge7z DllBuild 0017
Jochen Tucht [Sat, 19 Nov 2005 14:35:07 +0000 (14:35 +0000)]
Merge7z DllBuild 0017
Jochen Tucht [Sat, 19 Nov 2005 14:34:05 +0000 (14:34 +0000)]
no message
Jochen Tucht [Sat, 19 Nov 2005 14:29:17 +0000 (14:29 +0000)]
Merge7z DllBuild 0017
Kimmo Varis [Fri, 18 Nov 2005 22:05:19 +0000 (22:05 +0000)]
PATCH: [
1358408 ] Import and export for options
Kimmo Varis [Fri, 18 Nov 2005 17:56:37 +0000 (17:56 +0000)]
PATCH: [
1349645 ] Folder Compare Statistics dialog
PATCH: [
1347787 ] Use non-modal dialog for dir compare status
Kimmo Varis [Thu, 17 Nov 2005 22:09:05 +0000 (22:09 +0000)]
PATCH: [
1349645 ] Folder Compare Statistics dialog
PATCH: [
1347787 ] Use non-modal dialog for dir compare status
Kimmo Varis [Wed, 16 Nov 2005 15:57:31 +0000 (15:57 +0000)]
PATCH: [
1356783 ] Use OptionsMgr in SyntaxColors class
Tim Gerundt [Sat, 12 Nov 2005 22:54:47 +0000 (22:54 +0000)]
PATCH: [
1353472 ] Website changes for new stable release 2.4.2
Kimmo Varis [Wed, 9 Nov 2005 17:49:22 +0000 (17:49 +0000)]
PATCH: [
1350638 ] Move options read/write code to options panels
Kimmo Varis [Wed, 9 Nov 2005 17:25:54 +0000 (17:25 +0000)]
PATCH: [
1351769 ] Manual: Minor update to file compare chapter
Kimmo Varis [Tue, 8 Nov 2005 19:13:35 +0000 (19:13 +0000)]
PATCH: [
1350819 ] Manual: Small improvements for folder compare
Kimmo Varis [Tue, 8 Nov 2005 19:01:04 +0000 (19:01 +0000)]
PATCH: [
1350794 ] Manual: Update About doc chapter
Kimmo Varis [Tue, 8 Nov 2005 18:45:06 +0000 (18:45 +0000)]
PATCH: [
1350489 ] Use SelectFile() for external editor selection
Kimmo Varis [Tue, 8 Nov 2005 18:40:34 +0000 (18:40 +0000)]
Merge Perry's fix for OpenDlg/SelectFile() to Merge.cpp/SelectFile() (PATCH #
1348733)
Jochen Tucht [Sun, 6 Nov 2005 19:07:38 +0000 (19:07 +0000)]
PATCH: [
1327413 ] Fix bug in CDirDoc::AllowUpwardDirectory()
Jochen Tucht [Sun, 6 Nov 2005 19:00:45 +0000 (19:00 +0000)]
PATCH: [
1327413 ] Fix bug in CDirDoc::AllowUpwardDirectory()
Christian List [Sun, 6 Nov 2005 03:00:16 +0000 (03:00 +0000)]
PATCH: [
1341559 ] New CompareMSExcelFiles plugin
Perry Rapp [Sat, 5 Nov 2005 00:38:56 +0000 (00:38 +0000)]
PATCH: [
1348733 ] Fix open dialog for cvs version 2.4
Src: OpenDlg.cpp
Perry Rapp [Sat, 5 Nov 2005 00:06:53 +0000 (00:06 +0000)]
2005-11-05 Perry
PATCH: [
1337905 ] Allow comparing binary files with binary unpacker
Src: DirView.cpp
Perry Rapp [Fri, 4 Nov 2005 19:39:13 +0000 (19:39 +0000)]
2005-11-04 Perry
PATCH: [
1335072 ] Add text to Plugins.txt to cover DisplayXMLFiles
Plugins/dlls: Plugins.txt
Tim Gerundt [Wed, 2 Nov 2005 19:22:06 +0000 (19:22 +0000)]
Translate "OptionalFeatures" and "ProjectFileDesc" to German
Kimmo Varis [Wed, 2 Nov 2005 16:03:57 +0000 (16:03 +0000)]
WinMerge experimental release 2.5.0.1 (cvs)
Kimmo Varis [Wed, 2 Nov 2005 16:00:11 +0000 (16:00 +0000)]
Bump ShellExtension version to 1.6.2
Kimmo Varis [Wed, 2 Nov 2005 15:46:12 +0000 (15:46 +0000)]
PATCH: [
1345110 ] Properly compare projectfile extension
Kimmo Varis [Wed, 2 Nov 2005 15:40:14 +0000 (15:40 +0000)]
PATCH: [
1342550 ] Modernize file selection dialog
Kimmo Varis [Wed, 2 Nov 2005 15:22:40 +0000 (15:22 +0000)]
BUG: [
1341243 ] Current Find string is too fragile
Was resetting find string after rescanning
Tim Gerundt [Wed, 2 Nov 2005 11:54:50 +0000 (11:54 +0000)]
PATCH: [
1345382 ] Translated Shell Extension to German
Kimmo Varis [Tue, 1 Nov 2005 15:13:18 +0000 (15:13 +0000)]
PATCH: [
1344219 ] Manual: New FAQ items about archive files detection
Kimmo Varis [Tue, 1 Nov 2005 15:07:57 +0000 (15:07 +0000)]
PATCH: [
1344213 ] Manual: typo fixes for Configuration part
Kimmo Varis [Mon, 31 Oct 2005 17:00:59 +0000 (17:00 +0000)]
PATCH: [
1343059 ] Swedish translation update for 2.5.0.1 experimental
- submitted by Hans Eriksson
Kimmo Varis [Mon, 31 Oct 2005 16:54:55 +0000 (16:54 +0000)]
PATCH: [
1342871 ] Disable Copy Filenames for folders
Kimmo Varis [Mon, 31 Oct 2005 16:51:47 +0000 (16:51 +0000)]
RFE: [
1324314 ] CTRL+W to close current diff
Kimmo Varis [Sun, 30 Oct 2005 10:15:46 +0000 (10:15 +0000)]
PATCH: [
1310710 ] Fix bug #
1309450
- submitted by Jochen
Kimmo Varis [Sun, 30 Oct 2005 09:33:54 +0000 (09:33 +0000)]
PATCH: [
1341813 ] VSS project linking misdetects project files
Kimmo Varis [Sat, 29 Oct 2005 18:14:08 +0000 (18:14 +0000)]
Open 2.4 manual (update link)
Kimmo Varis [Sat, 29 Oct 2005 17:47:31 +0000 (17:47 +0000)]
PATCH: [
1341183 ] Fix VSS checkout canceling
Kimmo Varis [Sat, 29 Oct 2005 17:18:01 +0000 (17:18 +0000)]
PATCH: [
1341076 ] Manual: Mention maximum linefilter length
Perry Rapp [Tue, 25 Oct 2005 22:06:25 +0000 (22:06 +0000)]
2005-10-25 Perry
PATCH: [
1334444 ] Remove needless (& therefore confusing) cast
Src: LocationView.cpp
Tim Gerundt [Mon, 24 Oct 2005 22:13:44 +0000 (22:13 +0000)]
PATCH: [Web] Updated translation instructions
Perry Rapp [Sun, 23 Oct 2005 20:21:18 +0000 (20:21 +0000)]
Cosmetic changes to GetFunctionsFromScript, to document
arguments passed to GetTypeInfo.
Src: Plugins.cpp
Perry Rapp [Sun, 23 Oct 2005 17:37:56 +0000 (17:37 +0000)]
PATCH: [
1334484 ] Skip location view paint if buffer not initialized
Src: LocationView.cpp MergeDoc.cpp MergeDoc.h
MergeEditView.cpp MergeEditView.h
Kimmo Varis [Fri, 21 Oct 2005 13:50:19 +0000 (13:50 +0000)]
PATCH: [
1333581 ] Increase quick compare limit and make it option
Kimmo Varis [Fri, 21 Oct 2005 13:39:11 +0000 (13:39 +0000)]
PATCH: [
1333545 ] Small improvement to Open-dialog folder selection
Kimmo Varis [Fri, 21 Oct 2005 13:30:13 +0000 (13:30 +0000)]
PATCH: [
1329867 ] Manual: Improve Binary file FAQ
Tim Gerundt [Thu, 20 Oct 2005 21:19:15 +0000 (21:19 +0000)]
PATCH: [
1330179 ] Icon for 'Print'
Kimmo Varis [Thu, 20 Oct 2005 20:18:49 +0000 (20:18 +0000)]
PATCH: [
1332365 ] Make some DirActions.cpp functions consts
Kimmo Varis [Thu, 20 Oct 2005 14:17:31 +0000 (14:17 +0000)]
Changes.txt is new changelog file.
Kimmo Varis [Thu, 20 Oct 2005 14:16:22 +0000 (14:16 +0000)]
PATCH: [
1332160 ] Fix Project file description in shell
Kimmo Varis [Wed, 19 Oct 2005 17:58:55 +0000 (17:58 +0000)]
BUG: [
1326621 ] Extention ".WinMerge" is omitted
Kimmo Varis [Wed, 19 Oct 2005 14:43:46 +0000 (14:43 +0000)]
PATCH: [
1329951 ] Readme.txt points to version 2.2 manual
Tim Gerundt [Tue, 18 Oct 2005 20:42:49 +0000 (20:42 +0000)]
PATCH: [
1330059 ] Translated 3 missing sentences to German
Kimmo Varis [Sun, 16 Oct 2005 17:36:54 +0000 (17:36 +0000)]
PATCH: [
1305541 ] Rational ClearCase support
- submitted by Greg (rys1908)
Perry Rapp [Sat, 15 Oct 2005 19:19:03 +0000 (19:19 +0000)]
PATCH: [
1326813 ] Fix binary detection to allow archives
Src: DirView.cpp
Kimmo Varis [Thu, 13 Oct 2005 20:49:52 +0000 (20:49 +0000)]
PATCH: [
1305541 ] Rational ClearCase support
- submitted by Greg (rys1908)
Kimmo Varis [Wed, 12 Oct 2005 20:20:42 +0000 (20:20 +0000)]
Add Markus Rollmann to Contributors.txt
Kimmo Varis [Wed, 12 Oct 2005 20:17:43 +0000 (20:17 +0000)]
PATCH: [
1286629 ] print support
- submitted by Markus Rollmann
Kimmo Varis [Wed, 12 Oct 2005 19:07:48 +0000 (19:07 +0000)]
PATCH: [
1323107 ] Patch for crash on save filenames with different cases
- from anonymous submitter
Tim Gerundt [Mon, 10 Oct 2005 17:37:21 +0000 (17:37 +0000)]
PATCH: [
1321007 ] Web: Screenshots for 2.4
Perry Rapp [Wed, 5 Oct 2005 16:30:39 +0000 (16:30 +0000)]
2005-10-05 Perry
PATCH: [
1242008 ] Update status to binary if open fails because binary
Follow on for 2nd case
Src: DirView.cpp MergeDoc.cpp
Perry Rapp [Mon, 3 Oct 2005 18:31:04 +0000 (18:31 +0000)]
2005-10-03 Perry
PATCH: [
1302710 ] generating a report is slow
Perry added comments explaining one code line
Src: DirCmpReport.cpp
Kimmo Varis [Mon, 3 Oct 2005 16:59:21 +0000 (16:59 +0000)]
PATCH: [
1310214 ] Shell extension italian translation
- submitted by Andrea Decorte
Kimmo Varis [Mon, 3 Oct 2005 16:53:59 +0000 (16:53 +0000)]
PATCH: [
1302710 ] generating a report is slow
- submitted by Takashi Sawanaka
Perry Rapp [Sun, 2 Oct 2005 23:56:18 +0000 (23:56 +0000)]
PATCH: [
1253951 ] trivial cosmetic comment upgrade in arg parsing
Perry Rapp [Sun, 2 Oct 2005 23:54:45 +0000 (23:54 +0000)]
PATCH: [
1253950 ] cosmetic--remove old code in InitInstance
Perry Rapp [Sun, 2 Oct 2005 23:46:33 +0000 (23:46 +0000)]
PATCH: [
1253949 ] cosmetic comment fix
Jochen Tucht [Sun, 2 Oct 2005 13:01:52 +0000 (13:01 +0000)]
Merge7zInstaller update
Jochen Tucht [Sun, 2 Oct 2005 12:54:03 +0000 (12:54 +0000)]
Merge7z DllBuild 0015
Tim Gerundt [Fri, 30 Sep 2005 14:13:41 +0000 (14:13 +0000)]
PATCH: [
1309423 ] Small typo in MergeSwedish.rc
Tim Gerundt [Fri, 30 Sep 2005 14:02:31 +0000 (14:02 +0000)]
PATCH: [
1308987 ] Website changes for new stable release 2.4.0
Tim Gerundt [Fri, 30 Sep 2005 13:53:48 +0000 (13:53 +0000)]
PATCH: [
1308987 ] Website changes for new stable release 2.4.0
Perry Rapp [Tue, 27 Sep 2005 21:51:51 +0000 (21:51 +0000)]
2005-09-27 Perry
PATCH: [
1229867 ] RFE [
1205516 ], RFE [ 887948 ], and other issues
Cosmetic, transcribing comment from patch discussion
Src: 7zCommon.cpp
Kimmo Varis [Mon, 26 Sep 2005 15:25:07 +0000 (15:25 +0000)]
PATCH: [
1302608 ] crash on generating a report
- submitted by Takashi Sawanaka
Kimmo Varis [Sat, 24 Sep 2005 09:11:41 +0000 (09:11 +0000)]
BUG: [
1298687 ] The files marked as 'skipped' are compared
- fix from Takashi Sawanaka, comment updates by me
Perry Rapp [Fri, 23 Sep 2005 22:10:08 +0000 (22:10 +0000)]
PATCH: [
1301504 ] Danish ShellExtension translation
Kimmo Varis [Thu, 22 Sep 2005 18:34:27 +0000 (18:34 +0000)]
PATCH: [
1297642 ] Japanese translation update
- submitted by Takashi Sawanaka
Kimmo Varis [Thu, 22 Sep 2005 18:27:40 +0000 (18:27 +0000)]
PATCH: [
1297642 ] Japanese translation update
- submitted by Takashi Sawanaka
Kimmo Varis [Thu, 22 Sep 2005 17:20:22 +0000 (17:20 +0000)]
PATCH: [
1298109 ] Docs: Document ShellExtension versioning
Christian List [Thu, 22 Sep 2005 00:59:59 +0000 (00:59 +0000)]
[
1252903 ] Plugin to display MS Word files
Kimmo Varis [Wed, 21 Sep 2005 17:16:49 +0000 (17:16 +0000)]
PATCH: [
1297406 ] updated hungarian translation
- submitted by M�rton Bal�zs
Kimmo Varis [Tue, 20 Sep 2005 15:25:27 +0000 (15:25 +0000)]
PATCH: [
1295758 ] Update URL for downloads page (archive options)
Kimmo Varis [Tue, 20 Sep 2005 15:21:30 +0000 (15:21 +0000)]
PATCH: [
1295701 ] Scrolling for dir compare report filename
Kimmo Varis [Tue, 20 Sep 2005 15:15:54 +0000 (15:15 +0000)]
PATCH: [
1295701 ] Scrolling for dir compare report filename
Kimmo Varis [Tue, 20 Sep 2005 14:47:12 +0000 (14:47 +0000)]
PATCH: [
1295612 ] Manual: add tip for eols and linefilters
Kimmo Varis [Tue, 20 Sep 2005 14:41:23 +0000 (14:41 +0000)]
PATCH: [
1295601 ] Manual: Add linediff coloring
Kimmo Varis [Tue, 20 Sep 2005 14:39:21 +0000 (14:39 +0000)]
PATCH: [
1295568 ] Manual: New Open-dialog screenshot
Tim Gerundt [Mon, 19 Sep 2005 20:31:10 +0000 (20:31 +0000)]
PATCH: [
1295767 ] German Translation for 'Highlight Line * Diff'
Kimmo Varis [Mon, 19 Sep 2005 15:58:30 +0000 (15:58 +0000)]
PATCH: [
1295473 ] updated italian rc file for winmerge 2.3.6
- submitted by Andrea Decorte
Kimmo Varis [Mon, 19 Sep 2005 14:53:03 +0000 (14:53 +0000)]
PATCH: [
1295473 ] updated italian rc file for winmerge 2.3.6
- submitted by Andrea Decorte
Kimmo Varis [Mon, 19 Sep 2005 14:39:01 +0000 (14:39 +0000)]
PATCH: [
1294595 ] Manual: Update options
Kimmo Varis [Mon, 19 Sep 2005 14:33:46 +0000 (14:33 +0000)]
PATCH: [
1294514 ] Set file loading traces debug-only
Kimmo Varis [Sun, 18 Sep 2005 08:05:37 +0000 (08:05 +0000)]
PATCH: [
1294162 ] Manual: First update to file compare