diff options
| author | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2010-01-07 09:09:45 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2010-01-07 09:09:45 +0100 |
| commit | ae535daa20eecc9feb07941caf65f2966fb8f9b5 (patch) | |
| tree | 68952bf75486eaef712013c7f4556f67c1e188e0 /src | |
| parent | 138b12b5dc8e1b969dd81685f402b7f75c7a76dd (diff) | |
| parent | fdbdf50ce44871aae22a4e01f4366caafa643101 (diff) | |
| download | qt-creator-ae535daa20eecc9feb07941caf65f2966fb8f9b5.tar.gz | |
Merge branch '1.3'
Conflicts:
src/plugins/git/gitplugin.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/git/gitplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 5ceaeadf21..30d44c7a73 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -566,7 +566,7 @@ bool GitPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEdi tr("Do you want to commit the change?"), tr("The commit message check failed. Do you want to commit the change?"), &settings.promptToSubmit, !m_submitActionTriggered); - m_submitActionTriggered = false; + m_submitActionTriggered = false; switch (answer) { case VCSBase::VCSBaseSubmitEditor::SubmitCanceled: return false; // Keep editing and change file |