Merge remote-tracking branch 'origin/KDE/4.10'

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index e46c53a91078d43b5afa08cfedb69f83d93df4f5..e5ac4351c902e574534c2947eee3b5fad65356ae 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,10 +33,10 @@ KDE_EXPORT int kdemain(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
-                     "2.1.95",
+                     "2.2.60",
                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,
-                     ki18nc("@info:credit", "(C) 2006-2012 Peter Penz and Frank Reininghaus"));
+                     ki18nc("@info:credit", "(C) 2006-2013 Peter Penz and Frank Reininghaus"));
     about.setHomepage("http://dolphin.kde.org");
     about.addAuthor(ki18nc("@info:credit", "Frank Reininghaus"),
                     ki18nc("@info:credit", "Maintainer (since 2012) and developer"),
@@ -50,6 +50,9 @@ KDE_EXPORT int kdemain(int argc, char **argv)
     about.addAuthor(ki18nc("@info:credit", "David Faure"),
                     ki18nc("@info:credit", "Developer"),
                     "faure@kde.org");
+    about.addAuthor(ki18nc("@info:credit", "Emmanuel Pescosta"),
+                    ki18nc("@info:credit", "Developer"),
+                    "emmanuelpescosta099@gmail.com");
     about.addAuthor(ki18nc("@info:credit", "Aaron J. Seigo"),
                     ki18nc("@info:credit", "Developer"),
                     "aseigo@kde.org");