diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-01-20 14:21:46 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-01-20 14:21:46 +0100 |
| commit | cdd19fe6ad689aef9f884014e8d7ba29334d952a (patch) | |
| tree | fe0c3dde795ca7096a8150ed03a2578dfcb1124d /src/plugins/cpptools/cpprefactoringchanges.cpp | |
| parent | a309b3cfe6173a923988f645aad0488d65589f0f (diff) | |
| parent | 7312733452d01e32c80e82bc84e83a13fe0dbd5c (diff) | |
| download | qt-creator-cdd19fe6ad689aef9f884014e8d7ba29334d952a.tar.gz | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
Change-Id: If62ec06ea069a7eba6735101e5334b0c1f66861f
Diffstat (limited to 'src/plugins/cpptools/cpprefactoringchanges.cpp')
0 files changed, 0 insertions, 0 deletions