Commit d82aa71e authored by Joachim Eibl's avatar Joachim Eibl

util subdir renamed to bin

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@138 c8aa9fed-2811-0410-8543-893ada326672
parent 82e6c3b3
......@@ -2,7 +2,7 @@ Version 0.9.96 - 2011-09-02
===========================
- KDiff3FileItemActionPlugin : Context menu that also works in dolphin (for KDE>=4.6)
- Parser for preprocessor commands. (Allows single apostrophs ')
- On Windows if the preprocessor command is "sed" try to use a "util\sed.exe" next to the kdiff3.exe, if available.
- On Windows if the preprocessor command is "sed" try to use a "bin\sed.exe" next to the kdiff3.exe, if available.
- Warn if conversion errors appear (Invalid characters)
- Fix crash on A/B-overview (infinite recursion)
- Fix clearcase temp files not deleted problem on windows
......
......@@ -574,7 +574,7 @@ static QString getArguments( QString cmd, QString& program, QStringList& args )
#ifdef WIN32
if ( program=="sed" )
{
QString prg = QCoreApplication::applicationDirPath() + "/util/sed.exe"; // in subdir util
QString prg = QCoreApplication::applicationDirPath() + "/bin/sed.exe"; // in subdir bin
if ( QFile::exists( prg ) )
{
program = prg;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment