diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-07-01 09:01:26 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-07-01 09:01:26 +0200 |
| commit | 5a97e8ceb9e61d24dbd9d5dc24b8310aa6817f25 (patch) | |
| tree | 3b788c67cdbceca612969df06d851a806de3d73b /src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp | |
| parent | 5143e6c8ba2b131378646fdb03ac0da4d2e30b56 (diff) | |
| parent | ebf03b5c23e2222f52315b3544c93062910e9c5c (diff) | |
| download | qt-creator-5a97e8ceb9e61d24dbd9d5dc24b8310aa6817f25.tar.gz | |
Merge remote-tracking branch 'origin/4.13'
Conflicts:
src/plugins/android/androidsettingswidget.cpp
Change-Id: Iadf1d58a1e867ae7bb2dca55d3951613cfcc3d07
Diffstat (limited to 'src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp')
0 files changed, 0 insertions, 0 deletions