Commit graph

5 commits

Author SHA1 Message Date
markd
62f400bedd Update kdiff3 to 0.9.98
Version 0.9.98 - 2014-07-04
===========================
- Text rendering now with QTextLayout fixes the following issues
  - Correct handling for variable width fonts.
  - Corrected display of highlighted text with Qt4.8.x on Ubuntu and Mac.
  - Improved handling of texts with both right to left and left to right
    languages (mixed Arabic and western texts).
  - Improved handling of Chinese and Japanese.
  - Whitespace characters are now shown as dots for spaces and arrows for
    tabs, and not only in differences.
  - Fixed symlink comparison (Qt4 symLinkTarget returns absolute paths)
- Text analysis for rendering with QTextLayout is interruptable and
  multithreaded.  (See progressbar and abort-button in statusbar)
- Fix for saving to relative path in KDE-environments. (Patch from Harald Sitter)
- Fixed bug in 0.9.97: Directory compare was always case sensitive.
- Fix for saving files on KDE with relative path specified via command
  line option -o.
- Fixed problem with KIO (nonlocal urls).
- Improved Mac support.
- Write --confighelp information to stdout instead of stderr.
- Directory Merge Window: Enabled state of "Delete A And B" now also
  depends on existence of source file A.
- Works now with Qt4 and Qt5
- Progress dialog during printing.
- Workaround for bug in QSplitter::childEvent that broke
  QFileDialog::getSaveFileName
2014-11-14 10:08:09 +00:00
markd
c3f61257bd Update to 0.9.97
Version 0.9.97 - 2012-08-10
===========================
- Memory usage optimized for comparison of large directories. (ca. 1/5
  needed)
- In overwiev for two way diff show if only one side contains text.
- Fix for Fedora by Neal Becker in src-QT4/kdiff3part.desktop.
- When word wrap is active toggling line numbers now recalculates the
  word wrap.
- Removed confusing "For compatibility ..." hint from option -qall
- Fixed mouse wheel problem.
- Change an encoding in diff text window via click on encoding label.
- Fix for tab-key moving focus instead of adding a tab character in
  MergeResultWindow.
- Workaround for git on Cygwin that allows KDiff3 to find files in a
  Cygwin "/tmp" directory when environment variable "CYGWIN_BIN" is set.
- Removed iostream dependency
- Regression test framework
- Documentation patch
- Select text in Find dialog
- If text is selected in either input or output window use that in Find
  dialog.
- Added default directory anti patterns ".hg" and ".git" and file anti
  patterns ".rej" and ".bak" for better mercurial and git integration.
- Command line option --cs doesn't change the config value permanently
  anymore.
- On KDE: Not creating a KDiff3Part anymore.
2013-04-06 10:20:43 +00:00
markd
3a617c5f90 Update to 0.9.96
KDE4 version.
2012-03-21 23:10:54 +00:00
markd
382216dfe8 Fix build with gcc4.3 2011-01-30 02:08:18 +00:00
markd
2d8d7e9441 Initial import of kdiff3 0.9.91.
From Kimura Fuyuki in PR pkg/35914

KDiff3 is a program that

    * compares and merges two or three input files or directories,
    * shows the differences line by line and character by character (!),
    * provides an automatic merge-facility and
    * an integrated editor for comfortable solving of merge-conflicts
    * has support for KDE-KIO (ftp, sftp, http, fish, smb)
    * and has an intuitive graphical user interface.
2007-03-24 14:22:24 +00:00