Mercurial > hg > easyhg-kdiff3
comparison kdiff3/src-QT4/main.cpp @ 103:1b9430d5cf2b
Separate deltas if only one is of type where B==C
author | joachim99 |
---|---|
date | Sun, 28 Nov 2010 16:44:56 +0000 |
parents | 6f42f5bd218e |
children | 61d74c8be938 |
comparison
equal
deleted
inserted
replaced
102:4bac4535ea7f | 103:1b9430d5cf2b |
---|---|
160 const QByteArray& appName = QByteArray("kdiff3"); | 160 const QByteArray& appName = QByteArray("kdiff3"); |
161 const QByteArray& appCatalog = appName; | 161 const QByteArray& appCatalog = appName; |
162 const KLocalizedString i18nName = ki18n("kdiff3"); | 162 const KLocalizedString i18nName = ki18n("kdiff3"); |
163 const QByteArray& appVersion = QByteArray( VERSION ); | 163 const QByteArray& appVersion = QByteArray( VERSION ); |
164 const KLocalizedString description = ki18n("Tool for Comparison and Merge of Files and Directories"); | 164 const KLocalizedString description = ki18n("Tool for Comparison and Merge of Files and Directories"); |
165 const KLocalizedString copyright = ki18n("(c) 2002-2009 Joachim Eibl"); | 165 const KLocalizedString copyright = ki18n("(c) 2002-2010 Joachim Eibl"); |
166 const QByteArray& homePage = "http://kdiff3.sourceforge.net/"; | 166 const QByteArray& homePage = "http://kdiff3.sourceforge.net/"; |
167 const QByteArray& bugsAddress = "joachim.eibl" "@" "gmx.de"; | 167 const QByteArray& bugsAddress = "joachim.eibl" "@" "gmx.de"; |
168 KAboutData aboutData( appName, appCatalog, i18nName, | 168 KAboutData aboutData( appName, appCatalog, i18nName, |
169 appVersion, description, KAboutData::License_GPL_V2, copyright, description, | 169 appVersion, description, KAboutData::License_GPL_V2, copyright, description, |
170 homePage, bugsAddress ); | 170 homePage, bugsAddress ); |