[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ksshaskpass] src: Merge remote-tracking branch 'origin/Plasma/5.12'
From:       Luca Beltrame <null () kde ! org>
Date:       2018-01-22 6:32:43
Message-ID: E1edVet-0003fp-5R () code ! kde ! org
[Download RAW message or body]

Git commit ea7f39701c726ef1c400001ab9781fb93f2c08f6 by Luca Beltrame.
Committed on 22/01/2018 at 06:32.
Pushed by lbeltrame into branch 'master'.

Merge remote-tracking branch 'origin/Plasma/5.12'

M  +3    -1    src/main.cpp

https://commits.kde.org/ksshaskpass/ea7f39701c726ef1c400001ab9781fb93f2c08f6

diff --cc src/main.cpp
index 60575ad,e8cf4b9..658cf24
--- a/src/main.cpp
+++ b/src/main.cpp
@@@ -110,8 -110,8 +110,10 @@@ int main(int argc, char **argv
          QStringLiteral("armin@space-based.de")
      );
  =

+     about.addAuthor(i18n("Armin Berres"), i18n("Current author"), QString=
Literal("armin@space-based.de"));
+     about.addAuthor(i18n("Hans van Leeuwen"), i18n("Original author"), QS=
tringLiteral("hanz@hanz.nl"));
 +    about.addAuthor(i18n("Armin Berres"), i18n("Current author"), QString=
Literal("armin@space-based.de"), QString());
 +    about.addAuthor(i18n("Hans van Leeuwen"), i18n("Original author"), QS=
tringLiteral("hanz@hanz.nl"), QString());
      KAboutData::setApplicationData(about);
  =

      QCommandLineParser parser;
[prev in list] [next in list] [prev in thread] [next in thread]