diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-10-01 10:04:18 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-01 10:04:18 +0200 |
| commit | a0b2d10822fa61c859395dc5f1cb004c777170f3 (patch) | |
| tree | dc39004651e62cc814f5e6e9a9ba26543d323c9a /src/plugins/madde/maddedevicetester.cpp | |
| parent | 1d23165922e966c45a492f72e42a306b0754ff1d (diff) | |
| parent | d9602ca550c53e60a5229bfec9539e41fa5a694c (diff) | |
| download | qt-creator-a0b2d10822fa61c859395dc5f1cb004c777170f3.tar.gz | |
Merge remote-tracking branch 'origin/2.8'
Conflicts:
src/plugins/coreplugin/coreplugin.pro
src/plugins/coreplugin/coreplugin.qbs
src/plugins/cppeditor/cppdoxygen_test.cpp
src/plugins/cppeditor/cppquickfix_test.cpp
src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
src/plugins/cpptools/cppcompletion_test.cpp
Change-Id: I392229af933c1e56b9ea459d4d240a2144b4bfcb
Diffstat (limited to 'src/plugins/madde/maddedevicetester.cpp')
0 files changed, 0 insertions, 0 deletions