This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 2345e56b8c23333096781cd56a257e6badcf2e0e Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Oct 27 12:09:24 2017 +0200 x2gobrowserplugin-2.4_1/src/qtbrowserplugin.cpp: spelling fix. (convertable -> convertible) --- debian/changelog | 2 ++ x2gobrowserplugin-2.4_1/src/qtbrowserplugin.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a627c47..5cac233 100644 --- a/debian/changelog +++ b/debian/changelog @@ -235,6 +235,8 @@ x2goclient (4.1.1.0-0x2go1) UNRELEASED; urgency=medium - res/i18n/x2goclient_*.ts: regenerate translations. - res/i18n/x2goclient_fi.ts: various fixups for Finnish translation file. - src/sshmasterconnection.cpp: spelling fix. (Quiting -> Quitting) + - x2gobrowserplugin-2.4_1/src/qtbrowserplugin.cpp: spelling fix. + (convertable -> convertible) * x2goclient.spec: - Respect %{optflags} and pass QMAKE_STRIP=: to fix missing debug info issues. diff --git a/x2gobrowserplugin-2.4_1/src/qtbrowserplugin.cpp b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin.cpp index e7c6f31..06010d1 100644 --- a/x2gobrowserplugin-2.4_1/src/qtbrowserplugin.cpp +++ b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin.cpp @@ -395,7 +395,7 @@ static bool NPClass_Invoke(NPObject *npobj, NPIdentifier name, const NPVariant * } QVariant qvar = args[p]; if (type != QVariant::Invalid && !qvar.convert(type)) { - NPN_SetException(npobj, QString("Parameter %1 to method '%2' needs to be convertable to '%3'") + NPN_SetException(npobj, QString("Parameter %1 to method '%2' needs to be convertible to '%3'") .arg(p).arg(QString::fromUtf8(slotName)).arg(QString::fromAscii(parameterTypes.at(p))).toAscii().constData()); return false; } -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git