diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-11-24 15:43:48 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-11-24 15:43:48 +0100 |
| commit | a47fbb83094ac2d2014fdd563ae22be9f0200baa (patch) | |
| tree | 2b29ca96979b5facf549131aee58c13e9c2c368b /src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp | |
| parent | 63487158f1928f2d8499995783610839904ab149 (diff) | |
| parent | a4a4f7a4759e97142f751fdb91cb11536e5102e2 (diff) | |
| download | qt-creator-a47fbb83094ac2d2014fdd563ae22be9f0200baa.tar.gz | |
Merge remote-tracking branch 'origin/3.3'
Conflicts:
src/plugins/coreplugin/coreplugin.cpp
src/plugins/coreplugin/themesettingswidget.cpp
src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
src/plugins/qbsprojectmanager/qbsprojectmanager.h
src/plugins/qmlprofiler/qml/Overview.js
src/shared/qbs
Change-Id: Ibe92c166fc5bfbcb4d6964e50ca7298d8459d60e
Diffstat (limited to 'src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp')
0 files changed, 0 insertions, 0 deletions