diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-10-22 11:37:14 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-22 11:37:14 +0200 |
| commit | 16c2ee1b9917362a878633adfde7e22f347cab09 (patch) | |
| tree | c8db5148103444be3975fd8c4a98f1fe45dd4c7e /src/plugins/cpptools/cppmodelmanagerinterface.cpp | |
| parent | 8f00f261aa6965316f7ef197dfc24db527622f16 (diff) | |
| parent | a6d6db3397b82dc9fca5517c3ad2595f00c89f90 (diff) | |
| download | qt-creator-16c2ee1b9917362a878633adfde7e22f347cab09.tar.gz | |
Merge origin/2.8 into 3.0
Conflicts:
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
Change-Id: I1028a14230b9dea0cdb68068469a96e8ddb78754
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanagerinterface.cpp')
0 files changed, 0 insertions, 0 deletions