diff options
| author | con <[email protected]> | 2010-05-17 17:40:40 +0200 |
|---|---|---|
| committer | con <[email protected]> | 2010-05-17 17:40:40 +0200 |
| commit | 38f6379f3949779963b90c904e02314c8f2eaa50 (patch) | |
| tree | 146111bd5b7a5a73bef2cfde7e561e3375d6360e /src/plugins/git/gitclient.cpp | |
| parent | d8318a9502b2de2a5fc2e8984deb1383a4e216f7 (diff) | |
| parent | b52f3cb27464d20302599dec0f63e950a39dd64c (diff) | |
Merge remote branch 'origin/2.0'
Conflicts:
doc/qtcreator.qdoc
src/plugins/find/currentdocumentfind.cpp
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 8984813632c..8248d18d0d6 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -862,7 +862,7 @@ QString GitClient::synchronousStash(const QString &workingDirectory, do { if ((flags & StashPromptDescription)) { if (!inputText(Core::ICore::instance()->mainWindow(), - tr("Stash description"), tr("Description:"), &message)) + tr("Stash Description"), tr("Description:"), &message)) break; } if (!executeSynchronousStash(workingDirectory, message)) |