diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-04-02 13:24:34 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-04-02 13:24:34 +0200 |
| commit | cab8e4aa03b652afac22eeea63fb50b85d3b8196 (patch) | |
| tree | 478779968f62dfd08351818cfd2ab0ae000503ef /dist | |
| parent | c9a9814f896ab5869418583aef1a68138ce81530 (diff) | |
| parent | 0c68cbbaa926d48068cc30c766e202f1eb6c7360 (diff) | |
| download | qt-creator-cab8e4aa03b652afac22eeea63fb50b85d3b8196.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/qtsupport/qtversionmanager.cpp
src/shared/qbs
Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-3.1.0 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dist/changes-3.1.0 b/dist/changes-3.1.0 index 70a8d824f0..e60625d25e 100644 --- a/dist/changes-3.1.0 +++ b/dist/changes-3.1.0 @@ -99,6 +99,7 @@ Version Control Systems * Added completion in change selection dialog * Fixed freeze after resolving conflict with cherry-pick or revert * Added support for local branch selection in the Push to Gerrit dialog + * Removed branch list from "Git Show" header (QTCREATORBUG-11293) * ClearCase * Improved performance of indexing dynamic views * Added warning when editing Derived Objects |