diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-04-30 11:46:11 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-04-30 11:46:11 +0200 |
| commit | 3177c8535a0692c31c99beac0e416004a5350bbe (patch) | |
| tree | 2ac560c6cda516d5ebc54af6a83de3f1a4fc39a3 /src/plugins/cpptools/cppmodelmanagerinterface.cpp | |
| parent | c222a4f6236d85bcdf504880d422699c891014c6 (diff) | |
| parent | 629c130062fa1a962d0010f188a290f94496adc5 (diff) | |
| download | qt-creator-3177c8535a0692c31c99beac0e416004a5350bbe.tar.gz | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
src/plugins/clearcase/clearcaseplugin.cpp
src/plugins/clearcase/clearcasesync.cpp
Change-Id: Ie696e82f28770f3288c19e2174979f838f2876ad
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanagerinterface.cpp')
0 files changed, 0 insertions, 0 deletions