diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2020-07-17 07:35:57 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2020-07-17 07:38:17 +0300 |
| commit | a8c30c9253a0310a4f6eb4e5b26e9e793d0ebd64 (patch) | |
| tree | 26579c779dac60d8267f35c9b6ceff10967bdba9 /plugins/fossil/fossilclient.h | |
| parent | a0f4ce71e81dcf40e6c4c04f0fd87749ae71fd42 (diff) | |
| parent | cef9a471e64cb9bac4d88923ca4a96c84f0f92ca (diff) | |
Merge remote-tracking branch 'origin/4.13'
Change-Id: I87977120608b94bd2576b2217337c02fe34e4ceb
Diffstat (limited to 'plugins/fossil/fossilclient.h')
| -rw-r--r-- | plugins/fossil/fossilclient.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/fossil/fossilclient.h b/plugins/fossil/fossilclient.h index 20f3214..8cc64ae 100644 --- a/plugins/fossil/fossilclient.h +++ b/plugins/fossil/fossilclient.h @@ -122,7 +122,7 @@ private: QString sanitizeFossilOutput(const QString &output) const; QString vcsCommandString(VcsCommandTag cmd) const final; - Core::Id vcsEditorKind(VcsCommandTag cmd) const final; + Utils::Id vcsEditorKind(VcsCommandTag cmd) const final; QStringList revisionSpec(const QString &revision) const final; StatusItem parseStatusLine(const QString &line) const final; VcsBase::VcsBaseEditorConfig *createAnnotateEditor(VcsBase::VcsBaseEditorWidget *editor); |