joachim99@92: Version 0.9.95 - 2009/03/03 joachim99@92: =========================== joachim99@92: - Show line end style for each file. joachim99@92: - Updated message translations. joachim99@92: - Fixed permissions when writing executable file. (Un*x only) joachim99@92: - Fixed IgnorableCmdLineOptions (important for SVNs '-u'-option) joachim99@92: - Directory merge: Error when either B or C is changed and the other is deleted. (User choice required.) joachim99@92: - Qt-only Un*x-version looks for translations in /usr/share/locale//LC_MESSAGES/kdiff3.qm joachim99@92: (for Debian, by Eike Sauer) joachim99@92: - New script: po/create_qm_files: To create and install translations for Qt-only version. joachim99@92: joachim99@92: Version 0.9.94 - 2009/01/17 joachim99@92: =========================== joachim99@92: - Fix for hidden text windows with --auto-flag. joachim99@92: - Fix for pasting clipboard truncated text if it contained characters that needed more than one byte in UTF-8 encoding. joachim99@92: - Fix for horizontal scrolling if word wrap is enabled. joachim99@92: - Directory tree: files hidden due to options (e.g. patterns etc.) don't affect folder equality any more. joachim99@92: - KDE: KIO-progress dialog is now hidden. (KDiff3 has its own progress dialog.) joachim99@92: - Directory merge: Default op for change in either B or C and delete in the other is now merge (previously copy). joachim99@92: - Directory merge: Not preserving merge operation after reload, because it might have changed. joachim99@92: joachim99@92: Version 0.9.93 - 2009/01/06 joachim99@80: =========================== joachim99@80: - Support for KDE4 (with much porting help from Valentin Rusu) joachim99@80: - Fix for diff_ext_for_kdiff3 (by Sergey Zorin) joachim99@80: - Win32-Installation: SendTo-integration fixed for Vista. joachim99@80: - Optional auto detection of line end style for saving. joachim99@80: - Option to close on ESC (default is off) joachim99@92: - Option to align B and C for 3 input files (default is off which is usually better for merging). joachim99@80: joachim99@77: Version 0.9.92 - 2007/04/15 joachim99@77: =========================== joachim99@77: - Windows installer now allows to install KDiff3 as Clearcase Diff and Merge Tool joachim99@77: - Windows installer "SVN Merge tool" corrected: Not creating $AppData\Subversion\config subdir anymore. joachim99@77: - KDE-Konqueror plugin: Launch KDiff3 from Konqueror. (Similar to Diff-Ext on Windows.) joachim99@77: - Qt4-version joachim99@77: - Printing crash fixed joachim99@77: - Compilation issue for Mac fixed joachim99@77: - Dir Rescan keeps settings for Show identical files etc. joachim99@77: - Bugfix: Empty file and not existing file were detected as binary equal. joachim99@77: - Temp file names use the process id in file name to allow several instances. joachim99@77: - Suppress flicker during startup. (Don't show status info window on creation.) joachim99@77: - New File comparison mode: Trust the size and date, but use binary comparison if date doesn't match (unsafe) joachim99@77: - After explicitely selecting files any file of the selected may be right clicked for context menu. joachim99@77: - Open dialog also shows current directories in directory comparison mode. joachim99@77: - Writing a file via --auto option didn't work for relative files. (Reported by Guilhem Bichot) joachim99@77: - New option for history merge: Max number of history entries joachim99@77: - New option "Auto save and quit on merge without conflicts" joachim99@77: - Directory Merge with Case sensitivity disabled: Correct destination filename chosen for merge. joachim99@77: joachim99@75: Version 0.9.91 - 2006/10/29 joachim99@75: =========================== joachim99@75: - Encoding auto detection joachim99@75: - Fix for crash after double click below last line joachim99@75: - Saving of maximized window-state (Patch by Robert Vock) joachim99@75: - Separated Merge-options in own tab because "Diff and Merge"-options tab got too big. joachim99@75: - When pasting multiple lines into openfile dialog only first line is kept joachim99@75: - Drawing in directory view fixed. joachim99@75: - When specifying a separate output dir then for equal files a copy operation will also be offered. joachim99@75: - Windows specific: joachim99@75: - Windows installer problems fixed for users without admin-rights joachim99@75: - Fix for slow startup problem on Windows (Patch by Manfred Koehler) joachim99@75: - New: diff-ext-for-kdiff3 - Shell extension (originally by Sergey Zorin) joachim99@75: - Qt4-version: joachim99@75: - Saving of merge-result didn't work. joachim99@75: - Start external processes directly without cmd.exe-window joachim99@75: - Rewrote everything requiring Qt3-support joachim99@75: joachim99@73: Version 0.9.90 - 2006/05/14 joachim99@73: =========================== joachim99@73: - Fixed KIO-problems of type "File exists" with tempfiles (introduced in 0.9.89) joachim99@73: - Fix for manual alignment with 3 files which caused crash (new feature in 0.9.89) joachim99@73: - Fix for Alt-Left caused crash for leftmost window on windows (due to changed compiler) joachim99@73: - Use of WResizeNoErase|WRepaintNoErase instead of WNoAutoErase (fix for compiler error with Qt3.1) joachim99@73: - Removed #include which is (currently) unneeded and required extra dependencies. joachim99@73: - Removed "Save/Load Directory Merge State ..." in directory menu. (These aren't working yet.) joachim99@73: - Fixed crash when used as Diff-part with KDevelop. joachim99@73: - Preserve executable bit when overwriting an existing file. joachim99@73: joachim99@69: Version 0.9.89 - 2006/04/09 joachim99@69: =========================== joachim99@69: New features: joachim99@69: - Version control history auto merge plus sorting joachim99@69: - Auto merge regular expression joachim99@69: - Splitting and joining differences for merging joachim99@69: - Manual Diff Alignment tool joachim99@69: - Printing of differences joachim99@69: - Colorsettings for Dir-Colors joachim99@69: - Dir-show identical/different/A-only/B-only/C-only files with immediate effect (instead of option "List only deltas") joachim99@69: - Filename-edit above DiffInputWindows joachim99@69: - Windows-Context Menu in A/B/C-columns for dir-comparison (Windows only) joachim99@69: - Edit Menu: Select All (Ctrl-A) joachim99@69: - New commandline options: joachim99@69: --config filename: Select an individual config file. (Now also available for Windows and Qt-only version.) joachim99@69: --cs config: Change one specific setting via the command line. (For settings that were previously adjustable via GUI only.) joachim99@69: --confighelp: Show available config items and their current values. joachim99@69: - Dircomp: "Compare/Merge explicitly selected files" (Select files/dirs by clicking icons in columns A/B/C) joachim99@69: - User definable ignored command line options. joachim99@69: - Ability to swap pathnames in open dialog joachim99@69: - "Ignore"-button in error dialog when option not understood (Windows only) joachim99@69: - Quadratical scroll speedup during selection when mouse moves out of the diff input window. joachim99@69: Bugfixes, redesign: joachim99@69: - Preparations for Qt4-Port + some redesign joachim99@69: - GNU-Diff algorithm improved to be independent of line endings (needed for manual diff alignment) joachim99@69: - Avoid restoring a window where it is almost invisible (if moved almost out of the screen area) joachim99@69: - Go to next delta honors special "A vs. B", "A vs. C" or "B vs. C" overview when active. (Patch by Vladan Bato) joachim99@69: - DirectoryMergeWindow: File/Antifile and DirPattern changes will update immediately without rescan. joachim99@69: - Blue toolbar icons (for better visibility of disabled state) joachim99@69: - Bugfix: Crash when merging and selecting "Choose A/B/C for all unsolved conflicts" joachim99@69: and one of the solved conflicts contained no lines in chosen input. joachim99@69: - Fix: With --auto option, GUI stays invisible if not necessary joachim99@69: - Fixed odd ProgressDialog-behaviour when continuing after an error or abort. joachim99@69: - Directory merge: Fixed FollowFileLinks. (Didn't work when copying a file.) joachim99@69: - Initial position now (x=0,y=22). This solves a problem on some Macs. joachim99@69: - Better alignment of B and C in 3-file comparison joachim99@69: - Correctly updating the selection when scrolling via keys and mouse is pressed joachim99@69: - Horizontal scrolling in right-to-left language caused vertical lines - fixed. joachim99@69: joachim99@69: joachim99@69: Version 0.9.88 - 2005/25/02 joachim99@69: =========================== joachim99@69: - Fixed crash that occurred in Directory Comparison mode "Full-Analysis". joachim99@69: - Fix for Windows: Didn't save encoding correctly. joachim99@69: - Many translations updated. joachim99@69: joachim99@68: Version 0.9.87 - 2005/30/01 joachim99@68: =========================== joachim99@68: - Unicode16 and UTF8 support (Internal data format is now QString (Unicode16). Conversion during save and load.) joachim99@68: - Directory "Full Analysis": Equality-Coloring for files with only whitespace differences. (Michael Denio) joachim99@68: - Support for right to left languages. joachim99@68: - In MergeResultWindow show "" for whitespace-only conflicts joachim99@68: - Statusbar shows the number of remaining conflicts and whitespace conflicts. joachim99@68: - Go Next/Prev Difference/Conflict now have improved tooltips informing about "Show White Space"-disabled-behaviour. joachim99@68: joachim99@66: Version 0.9.86 - 2004/06/14 joachim99@66: =========================== joachim99@66: - Double click on any file in directory merge would close the directory merge window. (Regression in 0.9.85) joachim99@66: joachim99@66: Version 0.9.85 - 2004/06/14 joachim99@66: =========================== joachim99@66: - When solving a conflict KDiff3 reports the number of remaining unsolved conflicts in the status bar. joachim99@66: Bugfixes: joachim99@66: - Fix for MergeResultWindow-contextmenu: All items were disabled always. (new in 0.9.84) joachim99@66: - Fix for problem when opening files specified relative to current directory. (new in 0.9.84, qt-only-version) joachim99@66: - Fix for compilation with older gcc (2.9x) joachim99@66: - Several Word-wrap problems fixed: joachim99@66: - Find string with word wrap active didn't work if found text was not in first wrap-line. joachim99@66: - overview-position was not updated when toggling word wrap joachim99@66: - horizontal scrollbar was not updated when toggling word wrap joachim99@66: - current selection was lost when toggling word wrap joachim99@66: - selecting a conflict in the diff-text-window didn't work right with word wrap. joachim99@66: - Qt-only: Bold attribute for fonts was not persistent joachim99@66: - Qt-only: Toolbar position was not persistent joachim99@66: - Qt-only: Language-choice shows also the full language name. joachim99@66: - Cursor and windows-boundary-lines were always black instead of having the foreground color joachim99@66: - Starting KDiff3 with two not existing files showed a dialog saying that files are binary equal. joachim99@66: - Errors while starting a directory comparison now also reopens the open-dialog. joachim99@66: - Speedup during directory comparison by avoiding unnecessary redraws. (These always creep in again :-() joachim99@66: - On KDE: When resetting to default options (or first start) now the default KDE-fixed font will be used. joachim99@66: - Mergeresultwindow: Improved behaviour after automatic merge operation. joachim99@66: joachim99@66: Version 0.9.84 - 2004/05/29 joachim99@66: ============================ joachim99@66: New Features: joachim99@66: - Word Wrap for DiffTextWindow joachim99@66: - Directory-Comparison: Option "Full Analysis" allows to show the number of solved vs. unsolved joachim99@66: conflicts or deltas vs. whitespace-changes in the directory tree. joachim99@66: - Diff-Menu for Diff-view specific entries joachim99@66: - Docs now contain a new chapter for uses of preprocessor and line-matching-preprocessor. joachim99@66: - Added several credits which now are also visible in the Qt-only version. joachim99@66: - The Qt-only version now also shows all command-line options. Under windows a dialog shows them. joachim99@66: - Command line options -u and -L for Subversion-support. joachim99@66: - Command line options --L1/2/3 for specifying alias names. joachim99@66: - In the Qt-only-version the user-interface-language can be set via the regional-settings joachim99@66: (only effective after a restart). joachim99@66: - ProgressDialog redesign for recursive use. joachim99@66: - Overview now allows to show the delta between two other files in triplediff-mode. joachim99@66: - Option to ignore case which treats case-changes like white space (instead of conversion to upcase). joachim99@66: Bugfixes: joachim99@66: - Dir-Comp: When one file exists, but the other doesn't then instead the latest used other file was displayed. joachim99@66: - Open dialog: When previously a file C was used, but should be empty now, it reappeared unbidden. joachim99@66: - Several bugs for 64-bit systems fixed. joachim99@66: - Fixed crash when one file ended with a newline and the other did not. joachim99@66: - Windows: Case insensitive filename-pattern matching. joachim99@66: - Corrected behaviour for files with size 0. joachim99@66: - Fix for crash due to a race-condition (Patch by Eike Sauer) joachim99@66: - Windows: Scrolling didn't work right when another window was in front. joachim99@66: - Mergeresultwindow didn't show correct position when starting a second or later merge. joachim99@66: - Fix for problem where sometimes the A/B/C-buttons were in wrong state. joachim99@66: - Pasting from selection via the middle mousebutton. joachim99@66: joachim99@58: Version 0.9.83 - 2004/03/06 joachim99@58: =========================== joachim99@58: - Reading directorys fixed for Win95/98 joachim99@58: - Caseinsensitive filename matching for windows. joachim99@58: - Autocopy to selection for systems that support this. (Patch by Stefan Partheymueller) joachim99@58: - Drawing during recalc suppressed in merge result editor. joachim99@58: - Cursor could go beyond last line in merge result editor. (Corrected NrOfLine-counting.) joachim99@58: - Windows: Start with invalid cmd-line-options brings up a messagebox with the list of options. joachim99@58: - Corrected encoding when copying to or pasting from clipboard. joachim99@58: - Corrected char-by-char-diff at beginning of line. ("012345 12345 xyz" <-> "012345 xyz") joachim99@58: - Warning when merging with preprocessor or upcase-conversion enabled. joachim99@58: - Rewrite of preprocessing code should fix several problems. E.g.: joachim99@58: - Ignore C/C++-comments only worked with a preprocessor active. joachim99@58: - Preprocessor output now is input of line-matching preprocessor. joachim99@58: - Paste to diff-window, didn't work if LMPP or Ignore C/C++-Comments was set. joachim99@58: joachim99@58: Version 0.9.82 - 2004/02/02 joachim99@58: =========================== joachim99@58: - DirectoryMerge: Running merge op for last item in a folder, performed the joachim99@58: merge op for all following items in following folders. (Possible data loss!) joachim99@58: - Fix: Preprocessors and "Ignore Comments" didn't work at the same time. joachim99@58: - Fix: Preprocessors crashed with remote files. joachim99@58: - Open-Dialog: When either input is changed, then reset the output to be empty. joachim99@58: (To avoid accidental overwrites.) joachim99@58: - Icon for "Highlight white space differences." joachim99@58: - Editor-Option: Line End Style for saving: Dos/Windows "\r\n" vs. Unix "\n" joachim99@58: - Merge output editor: Corrected wrong encoding for output-filename and joachim99@58: user-typed characters. joachim99@58: - Speedup for reading directories under Windows. joachim99@58: - Enhanced progress dialog responsiveness during local file copy. joachim99@58: - Fix for non-KDE-version: No URL-encoding when dropping files in open dialog. joachim99@58: joachim99@53: Version 0.9.81 - 2004/01/08 joachim99@53: =========================== joachim99@53: - Allow to compile with --enable-final joachim99@53: - Bugfix for 3 file-compare (and A or B don't exist, crashed) joachim99@53: - Bugfix for crash when second directory is merged joachim99@53: - Some keyboard-shortcuts for selection of merge-operation didn't work correctly. joachim99@53: - Shortcuts Ctrl-1/2/3 are possible in textmergewindow and in dirmergewindow, joachim99@53: depending on the focus. joachim99@53: - First steps towards internationalisation joachim99@53: - Manpage doc/en/kdiff3.1 by Eike Sauer (for Debian) joachim99@53: - Directory rescan shortcut SHIFT-F5 joachim99@53: joachim99@51: Version 0.9.80 - 2003/12/08 joachim99@51: =========================== joachim99@51: New Text Diff/Merge Features: joachim99@51: - Now using GNU-diff algorithms internally. (Option "External Diff" removed.) joachim99@51: - Option for treating C/C++ comments as whitespace during diff. joachim99@51: - Bugfix for locale character encoding (+ new option "Use string encoding") joachim99@51: - Option for suppressing highlighting in white-space changes. joachim99@51: (Also suppresses highlighting in comments and numbers when the joachim99@51: respective options are active.) joachim99@51: - Merge-menu: Choose A/B/C for all unsolved conflicts. joachim99@51: Choose A/B/C for all unsolved whitespace conflicts. joachim99@51: - Options to automatically choose a certain source for whitespace conflicts. joachim99@51: - Shorcut F5 now used to reload the current file. joachim99@51: joachim99@51: New Directory-Comparison/Merge Features: joachim99@51: - Option to trust filesize. (Some directory services don't copy the date/time correctly.) joachim99@51: - Shortcut F7 now starts complete directory merge (previously F5). joachim99@51: - Do the selected merge operation for the selected file/dir only joachim99@51: "Run Operation For Current Item" (F6). joachim99@51: - Shortcuts for selecting the merge operation for the selected item. joachim99@51: Ctrl-1/2/3/4/Del select A/B/C/Merge/Delete respectively. joachim99@51: joachim99@51: Other Improvements: joachim99@51: - Several i18n-corrections (by Stephan Binner) joachim99@51: - Bugfix for option CVS-ignore: Didn't work correctly in subdirectories. joachim99@51: - Bugfix for remote operations: Operation can now be aborted, when KIO-slaves doesn't respond. joachim99@51: - Cancel-Button in progress bar. joachim99@51: - Default diff-view now again side by side instead of one above the other. joachim99@51: joachim99@51: joachim99@58: Version 0.9.71 - 2003/10/17 joachim99@35: =========================== joachim99@35: - Windows-Installer by Sebastien Fricker. joachim99@35: - Bugfixes for Windows. (Problems with setFont() in paintEvent().) joachim99@35: - Default font for Windows now "Courier New" (instead of Courier) joachim99@35: - Fix for compilation with gcc 2.95 joachim99@35: - Support for Ctrl-Tab under Windows. joachim99@35: - Fix for finding documentation. joachim99@42: - Fix for problem with directory-sync-mode (new in 0.9.70). joachim99@42: - Fix for several subsequent CR-characters in input file. joachim99@35: joachim99@12: Version 0.9.70 - 2003/09/28 joachim99@12: =========================== joachim99@12: - Transparent access to URLs via KIO (KDE only): joachim99@12: Compare files and directories on ftp, fish, smb, tar etc. ressources. joachim99@12: - Workaround for a Win32-bug (Crashed sometimes during selections) joachim99@12: - When the merge flag is selected in the open dialog, the directory-tool joachim99@12: always starts a merge by default for each file. Without the flag only a joachim99@12: diff will be started by default. joachim99@12: - Immediately showing progress bar in dir scan. joachim99@12: - Showing progress bar for file comparison too. joachim99@12: - Directory-menu: Fold/Unfold all subdirs joachim99@12: - Bugfix for 3-way auto-merge: A line deleted from the base in B and C joachim99@12: resulted in a empty line instead of being completely removed. joachim99@12: - Improved locale support joachim99@12: - KDiff3 is now a KPart joachim99@12: - in KDevelop3 it can be used to compare the current text with the joachim99@12: last saved version, or the current version on disk with the last cvs version. joachim99@12: - in Konqueror it can be used to look at a unified *.patch-file if one complete joachim99@12: version is available too. joachim99@12: - Documentation is now in docbook-format. joachim99@12: - "Toggle Split Orientation" for Diff-Input windows. (Good for long lines.) joachim99@12: - When "Dir and Text Split-Screen-View" is off: Now "Focus Next/Prev Window" joachim99@12: also toggles between dir and text-windows. Selecting a file via double click joachim99@12: switches to text-screen. joachim99@12: - KDiff3 displays a warning when trying to read a dir without the permission. joachim99@12: - Directory-Diff-Option "Use CVS-Ignore" to ignore files like CVS does. joachim99@12: - Displaying a status message at the end of the directory-comparison. joachim99@12: - Cursor in MergeResultWindow is automatically placed at current difference when a jump occurred. joachim99@12: (But not when something was selected.) joachim99@12: - Fix for cursor blinking in the topline of the MergeResultWindow. joachim99@12: joachim99@12: joachim99@12: Version 0.9.61 - 2003/06/07 joachim99@12: =========================== joachim99@12: - Compilation problem fixed. joachim99@12: - Directory merge: Preserving file attributes and times during copy. (now also for Win32) joachim99@12: - Crash fixed, when directory comparison from the command-line was started. joachim99@12: joachim99@12: joachim99@12: Version 0.9.60 - 2003/06/01 joachim99@12: =========================== joachim99@12: New features: joachim99@12: - New ways to select input for the diff window: joachim99@12: - Pasting clipboard text into a diff window. joachim99@12: - Drag and drop a file from a filemanager (e.g. konqueror) onto a diff window. joachim99@12: - Drag and drop text from an editor (e.g. kate) onto a diff window. joachim99@12: Reanalysis starts immediately if no merge is in progress. joachim99@12: (This should help you to compare similar parts in the same file.) joachim99@12: - New/Deleted white lines are now also considered as white deltas. joachim99@12: - Configurable keyboard shortcuts for most actions (KDE version only). joachim99@12: - The overview now also distinguishes whitespace deltas. joachim99@12: New preprocessor options: joachim99@12: - You can now define your own external Preprocessor and LineMatchingPreprocessor: joachim99@12: - "Convert to upper case", joachim99@12: - "Ignore numbers" joachim99@12: Fixed bugs: joachim99@12: - Directory merge: Preserving file attributes and times during copy. joachim99@12: (not for Win32 yet) joachim99@12: Source-tree-structure: joachim99@12: - Switch to KDevelop3 (Gideon): Renamed subdir "kdiff3" to "src". joachim99@12: - xpm-files in xpm-subdirectory. joachim99@12: joachim99@12: joachim99@12: Version 0.9.51 - 2003/04/14 joachim99@12: =========================== joachim99@12: - Compilation fix for gcc 2.95. joachim99@12: joachim99@12: joachim99@12: Version 0.9.50 - 2003/03/30 joachim99@12: =========================== joachim99@12: Fixed bugs: joachim99@12: - Auto-Advance setting was lost when entering the settings-dialog. joachim99@12: - Windows specific: Keys with AltGr-Combination didn't work. joachim99@12: - Windows 95/98/ME: Fixed crash when KDiff3 is called used without parameters, joachim99@12: and corrected support for external diff. joachim99@12: New Features: joachim99@12: - Search-function: Search for a string in all open text windows. joachim99@12: - Special background colors for current region. joachim99@12: - Button to toggle showing of whitespace in differences. joachim99@12: - Buttons to go to next/prev unsolved (!) conflict. joachim99@12: - While auto-advance waits, no more choices are allowed. joachim99@12: - New setting: Auto-advance-delay. joachim99@12: (Note that with delay 0 fast clicks might be detected as double clicks and the second joachim99@12: click does nothing. My advice: Prefer the keyboard-shortcuts Ctrl-1/2/3) joachim99@12: - Functions to Show/Hide Diff Window A, B or C. The other windows then have more space. joachim99@12: - Merge editor: The right mouse button selects the current region and lets you choose joachim99@12: A, B or C via a popup menu. joachim99@12: - Commandline option --auto: No GUI if all conflicts are auto-solvable. joachim99@12: - When equal files are compared, then a message box informs you. joachim99@12: - Merge current file: When comparing two or three files, the merge can be started with a single click. joachim99@12: - Option dialog: Warning for "Defaults" added, because it resets all options. joachim99@12: - A warning is given, when the user tries to merge binary files. (i.e. files that contain '\0'-bytes) joachim99@12: Changed behaviour: joachim99@12: - 3 file automerge: When for a line B==C (and A!=B) then C will be selected. joachim99@12: (In older versions this was a conflict. I was convinced that this is no problem.) joachim99@12: - Auto-Advance now jumps to next unsolved (!) conflict. joachim99@12: - On 256-color-displays KDiff3 uses them. (Previously KDiff3 only used 16 colors.) joachim99@12: - On 16-color-displays the Defaults-button in the options dialog selects special colors. joachim99@12: joachim99@12: joachim99@12: Version 0.941 - 2003/02/09 joachim99@12: ========================== joachim99@12: Fixed bugs: joachim99@12: - Qt-only-version: Compile problem corrected. joachim99@12: - Documentation: Formatting for tables corrected. joachim99@12: joachim99@12: joachim99@12: Version 0.94 - 2003/02/09 joachim99@12: ========================= joachim99@12: New features: joachim99@12: - Option to use external GNU-diff for line matching. joachim99@12: (Sometimes GNU-diff is better, sometimes not: You may choose now.) joachim99@12: - In diff-windows a tooltip shows the full path if you move the mouse on the filename. joachim99@12: - Speedup of directory-merge operations without user interaction. joachim99@12: (Not every item in the tree is made visible anymore. This took too long.) joachim99@12: - When opening a file for comparison or merge KDiff3 immediately shows the first difference. joachim99@12: - "Go To Top/Bottom"-action have been changed to "Go To First/Last Delta". joachim99@12: - Font-Option "Italic For Deltas" added. joachim99@12: - Many icons and actions will only be enabled, when the operation is possible. joachim99@12: - Icon for merge of current file in directory merge mode added. joachim99@12: - New action "Go to Current Delta". joachim99@12: - Conflicts where some lines contained only-white-space-changes are now separated from joachim99@12: other non-white-space-conflicts. joachim99@12: - Experimental: Use as replacement for ClearCase-cleardiffmrg.exe (under Windows only). joachim99@12: See main.cpp for details. joachim99@12: joachim99@12: Fixed bugs: joachim99@12: - If files were different, but had the same dates, the "not existant"-icon was joachim99@12: shown for one file. Now a error message will be shown if the option joachim99@12: "Copy newer instead of merging" is used. joachim99@12: - Documentation: Section "The Operation Column" corrected. joachim99@12: - Qt-only-version: Fontsize wasn't correctly restored. joachim99@12: - Keyboard accelerators didn't work for ToggleActions. joachim99@12: joachim99@12: joachim99@12: Version 0.931 - 2003/01/19 joachim99@12: ========================== joachim99@12: Fix for compilation problems with gcc version < 3. joachim99@12: joachim99@12: joachim99@12: Version 0.93 - 2003/01/16 joachim99@12: ========================= joachim99@12: New features: joachim99@12: - Directory comparison and merge. (More than 3000 new lines of code only here!!!) joachim99@12: - Open-Dialog: Filename specification: If no previous filename is there then start joachim99@12: directory is taken from another file. joachim99@12: - Message about number of found and automatically solved conflicts. joachim99@12: - Support for wheelmouse based scrolling. joachim99@12: - New option in Diff-tab: Preserve Carriage Return Characters joachim99@12: joachim99@12: Fixed bugs: joachim99@12: - Save button disabled until all conflicts are solved. joachim99@12: - Copy-operation conserves conflict messages "". joachim99@12: - Paste operation created pseudo conflicts when the clipboard contained empty lines. joachim99@12: - W95/98/ME specific program crash removed. joachim99@12: joachim99@12: joachim99@12: Version 0.92 - 2002/11/04 joachim99@12: ========================= joachim99@12: Severe bug corrected: joachim99@12: - Merge menu: Choose A/B/C Everywhere sometimes lost data. (introduced in 0.9) joachim99@12: joachim99@12: joachim99@12: Version 0.91 - 2002/11/03 joachim99@12: ========================= joachim99@12: Speed improvements for very big/complicated files: joachim99@12: - Faster analysis because of limited search range (can be adjusted). joachim99@12: - Faster scrolling and editor behaviour. joachim99@12: joachim99@12: Fixed bugs: joachim99@12: - Compilation problem with gcc 3.2 fixed. joachim99@12: - When comparing two lines, matching spaces often were undetected. joachim99@12: - Merge editor appended extra empty line when saving. joachim99@12: - Sometimes the next diff/conflict wasn't made visible. joachim99@12: - The Auto-Advance setting is saved now. joachim99@12: - When doing a merge the application now has modified-state, joachim99@12: even without further input. (The old method wasn't safe.) joachim99@12: - File selection now always in directory of respective file. joachim99@12: joachim99@12: joachim99@12: Version 0.9 - 2002/10/16 joachim99@12: ======================== joachim99@12: New features: joachim99@12: - Qt-only support. Allows compilation under KDE2, Gnome, Mac, Windows, ... joachim99@12: Note that KDE3 still gets special treatment. joachim99@12: - For Mergers: Auto-Advance after selection, Choose A/B/C everwhere, ... joachim99@12: - Commandline: If files with same name in different directories joachim99@12: are compared, only the first parameter needs the filename. joachim99@12: - Shift-Del, Ctrl-Ins, Shift-Ins supported for Cut/Copy/Paste joachim99@12: joachim99@12: Fixed bugs: joachim99@12: - Make failed on some systems because of missing "minmax.h". joachim99@12: - Files where opened for reading, but not closed afterwards. joachim99@12: - Vertical scrollbar sometimes didn't work correctly. joachim99@12: joachim99@12: joachim99@12: joachim99@2: Version 0.81 - 2002/08/18 joachim99@12: ========================= joachim99@2: New features: joachim99@2: - Now KDE3 is also supported. Previously only KDE2 was supported. joachim99@2: - Navigation via click into the overview column now supported. joachim99@2: joachim99@2: Fixed bugs: joachim99@2: - Some input files caused a crash in the diff-algorithm. joachim99@2: - The meaning of option "Ignore trivial matches" was inverted. joachim99@2: - When selecting a text in one window, this deselects any previously joachim99@2: active selection in the same or another window. joachim99@2: joachim99@2: joachim99@2: joachim99@2: Version 0.8 - 2002/07/28 joachim99@2: ======================== joachim99@2: This is the first version to be released.