diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-05-07 14:40:11 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-05-07 14:40:11 +0200 |
| commit | d5956e92ed3eed6dd0d54f7a65a246f4884b0080 (patch) | |
| tree | f2ce23d16f36d0681c06726e6607f320dc7a19bd /plugins/clangstaticanalyzer/clangstaticanalyzer.qbs | |
| parent | 1a122c2e251649d78edb0f535222fd4359948ee2 (diff) | |
| parent | 59e01e2a89290c0aa4a50d7064bbaade511cc8c3 (diff) | |
| download | qt-creator-d5956e92ed3eed6dd0d54f7a65a246f4884b0080.tar.gz | |
Merge remote-tracking branch 'origin/3.4'
Conflicts:
plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
Change-Id: I0362a5bb2a44c2608c2c074df45fffa022446cc4
Diffstat (limited to 'plugins/clangstaticanalyzer/clangstaticanalyzer.qbs')
0 files changed, 0 insertions, 0 deletions