diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-06-26 15:28:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-06-26 15:28:42 +0200 |
| commit | 22e31f2b4520949ab5608e8a8752342ecda19b1c (patch) | |
| tree | 544740d2c8af98493110e94dfd3f058ef6a56a09 /src/plugins/cpptools/cpptoolsplugin.cpp | |
| parent | f40c50c61b41813957f78d9687a132be4c83c9d5 (diff) | |
| parent | c219a5b5142752fab50fe761e815959cc16fabe1 (diff) | |
| download | qt-creator-22e31f2b4520949ab5608e8a8752342ecda19b1c.tar.gz | |
Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
src/libs/cplusplus/LookupContext.cpp
src/plugins/plugins.pro
src/plugins/qnx/Qnx.pluginspec.in
src/plugins/qnx/qnx_dependencies.pri
Change-Id: I6c406c2503845b08c4852db99c64491a325629c7
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
0 files changed, 0 insertions, 0 deletions