diff options
| author | Frank Reininghaus <[email protected]> | 2013-01-30 21:06:34 +0100 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2013-01-30 21:06:34 +0100 |
| commit | 5d4d73ff0829f206f9cd44023afc1a2f12cc6096 (patch) | |
| tree | c19b2915f8bed41a145e695b43e603800737812a /src/main.cpp | |
| parent | 8371fb6d75e4c6985b0fe7a2c5bdb55783dfd811 (diff) | |
| parent | 89134d62c72961f81c231feeaaa727f055e4f61a (diff) | |
Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
dolphin/src/tests/kfileitemmodeltest.cpp
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 06328bd2e..59575fdaf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,7 +33,7 @@ KDE_EXPORT int kdemain(int argc, char **argv) { KAboutData about("dolphin", 0, ki18nc("@title", "Dolphin"), - "2.1.98", + "2.2", ki18nc("@title", "File Manager"), KAboutData::License_GPL, ki18nc("@info:credit", "(C) 2006-2012 Peter Penz and Frank Reininghaus")); |