1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00

Merge branch 'next' into fw_wiz

Conflicts:
	ground/openpilotgcs/src/plugins/welcome/welcomemode.cpp
This commit is contained in:
Fredrik Larson 2014-09-03 02:48:34 +10:00
commit b59857e3e7

View File

@ -164,7 +164,7 @@ void WelcomeMode::networkResponseReady(QNetworkReply *reply)
reply->deleteLater();
if (version != VersionInfo::tagOrHash8()) {
m_newVersionText = tr("(Update Available: %1)").arg(version);
m_newVersionText = tr("Update Available: %1").arg(version);
emit newVersionTextChanged();
}
}