Commit d66d188f authored by con's avatar con
Browse files

Build fix.

Reviewed-by: kh
parent 886aef93
......@@ -88,11 +88,6 @@ public:
MaemoDeviceConfig deviceConfig() const;
QString runtimeGdbServerPort() const;
<<<<<<< HEAD
=======
const QString sshCmd() const;
const QString scpCmd() const;
>>>>>>> origin/2.0
const QString gdbCmd() const;
const QString dumperLib() const;
......@@ -113,10 +108,6 @@ private slots:
private:
void init();
<<<<<<< HEAD
=======
const QString cmd(const QString &cmdName) const;
>>>>>>> origin/2.0
const MaemoToolChain *toolchain() const;
bool fileNeedsDeployment(const QString &path, const QDateTime &lastDeployed) const;
void addDeployTimesToMap(const QString &key,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment