diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-01-19 16:41:17 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-01-19 16:41:17 +0100 |
| commit | 98257617e96917a328cdf7b72c6cdfb12e0d3394 (patch) | |
| tree | 614e84c8990ecb4ba1458488e21a333e27ffa190 /scripts/qdoc2tasks.pl | |
| parent | aa37df645d97698afe5732739f662f3cbc5a9c9d (diff) | |
| parent | f8d4e4954b9b1b0419443b1d90fe1a597b649dd2 (diff) | |
Merge remote-tracking branch 'origin/3.6'
Conflicts:
src/plugins/clangcodemodel/clangassistproposalmodel.cpp
src/plugins/clangcodemodel/clangassistproposalmodel.h
Change-Id: Iba30d2f4d95fa0f551afe58890d15f5835dfb715
Diffstat (limited to 'scripts/qdoc2tasks.pl')
0 files changed, 0 insertions, 0 deletions