Mercurial > hg > easyhg-kdiff3
changeset 97:5024edf90636
- Fixed typo.
- Applied patch for installation of kdiff3_part.rc (Sourceforge id
2978067)
| author | joachim99 |
|---|---|
| date | Sun, 28 Mar 2010 19:52:18 +0000 |
| parents | 9000a9763f6f |
| children | 236f1c9c3fbf |
| files | kdiff3/src-QT4/CMakeLists.txt kdiff3/src-QT4/diff.cpp |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/kdiff3/src-QT4/CMakeLists.txt Thu Mar 25 20:37:37 2010 +0000 +++ b/kdiff3/src-QT4/CMakeLists.txt Sun Mar 28 19:52:18 2010 +0000 @@ -48,7 +48,7 @@ ########### install files ############### install( FILES kdiff3part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3 ) +install( FILES kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3part ) install( FILES kdiff3_shell.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3 ) install( FILES kdiff3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
--- a/kdiff3/src-QT4/diff.cpp Thu Mar 25 20:37:37 2010 +0000 +++ b/kdiff3/src-QT4/diff.cpp Sun Mar 28 19:52:18 2010 +0000 @@ -1660,7 +1660,7 @@ { KMessageBox::error(0, i18n( "Data loss error:\n" - "If it is reproducable please contact the author.\n" + "If it is reproducible please contact the author.\n" ), i18n("Severe Internal Error") ); assert(false); std::cerr << "Severe Internal Error.\n"; @@ -1674,7 +1674,7 @@ { KMessageBox::error(0, i18n( "Data loss error:\n" - "If it is reproducable please contact the author.\n" + "If it is reproducible please contact the author.\n" ), i18n("Severe Internal Error") ); assert(false); std::cerr << "Severe Internal Error.\n";