diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-06-27 14:24:57 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-06-27 14:24:57 +0200 |
| commit | c9128b7fdd59f8482fcd5e8bc5e0d481ad5e86d1 (patch) | |
| tree | 421eb840b83dc79a2fd958eb4af25c88d0dce97f /src/plugins/cpptools/cppmodelmanagerinterface.cpp | |
| parent | 9055eea11f86fce9157970088af0832cff17e1df (diff) | |
| parent | 6c8f87556a2c7acdddca750e078b568ba082acf3 (diff) | |
| download | qt-creator-c9128b7fdd59f8482fcd5e8bc5e0d481ad5e86d1.tar.gz | |
Merge remote-tracking branch 'origin/2.8'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanagerinterface.cpp')
0 files changed, 0 insertions, 0 deletions