Enabled state of m_pDirCurrentSyncDeleteAAndB now also depends on source file A.

Signed-off-by: joachim99 <joachim.eibl@gmx.de>
Disable preserve line endings.

Signed-off-by: joachim99 <joachim.eibl@gmx.de>
Merge branch 'HEAD' of https://joachim99@git.code.sf.net/p/kdiff3/code
Fixed crash on resize with word wrap.
Signed-off-by: joachim99 <joachim.eibl@gmx.de>
Fix compilation issues.

Signed-off-by: joachim99 <joachim.eibl@gmx.de>
- With word-wrap on window-resizing is smooth again.
- During word wrap the progress bar shows in the status bar.
Signed-off-by: joachim99 <joachim.eibl@gmx.de>
Fixed included.

Signed-off-by: joachim99 <joachim.eibl@gmx.de>
More improved word wrap handling.

Signed-off-by: joachim99 <joachim.eibl@gmx.de>
Fix KDE specific issues.

Signed-off-by: joachim99 <joachim.eibl@gmx.de>
Fixed printing of diffview. Progressdialog during printing.

Signed-off-by: joachim99 <joachim.eibl@gmx.de>
Small corrections.
Signed-off-by: joachim99 <joachim.eibl@gmx.de>
Mac specific libs added.
Merge with Mac specific changes.
- Handle compilation issues.
- Invert cursor direction when "right to left language" is enabled.
- Workaround for bug in QSplitter::childEvent that broke QFileDialog::getSaveFileName

Signed-off-by: joachim99 <joachim.eibl@gmx.de>
Merge branch 'master' of ssh://git.code.sf.net/p/kdiff3/code
Mac OSX specific fixes:
- With Qt4.8.6 DotLine didn't work, using DashLine instead
- Support for translation files in app-resources.

Signed-off-by: Joachim <joachim.eibl@gmx.de>
Updated Readme and Changelog.

Signed-off-by: Joachim <joachim.eibl@gmx.de>
Merge remote-tracking branch 'upstream/master'