diff options
| author | Eike Ziller <[email protected]> | 2013-07-08 15:01:17 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2013-07-08 15:01:17 +0200 |
| commit | a98fe15fe51a87e2943623caf2a8ea072cfc5919 (patch) | |
| tree | cd591ee60c464a385c02a92bcaba34ccdeadcd2e /src/plugins/git/gitclient.h | |
| parent | 2c211007257f5e58e2809692b74bb5b18f63b80c (diff) | |
| parent | 07c0a8348c59945465e9f2330a40f625543f7f8a (diff) | |
Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
qbs/pluginspec/pluginspec.qbs
Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
Diffstat (limited to 'src/plugins/git/gitclient.h')
| -rw-r--r-- | src/plugins/git/gitclient.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 749b2ac038b..a51735eca66 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -327,6 +327,7 @@ private slots: void appendOutputData(const QByteArray &data) const; void appendOutputDataSilently(const QByteArray &data) const; void finishSubmoduleUpdate(); + void fetchFinished(const QVariant &cookie); private: QTextCodec *getSourceCodec(const QString &file) const; |