diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-11 10:30:30 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-11 10:30:30 +0100 |
| commit | 83582b2d57546071d0ce99cd405dd4a6dbd3f963 (patch) | |
| tree | 79945efef644f90fbf981074a4669f623bd0082a /src/plugins/diffeditor/diffeditor.cpp | |
| parent | b201c9be2b35256fd927ed16208479286093fdef (diff) | |
| parent | 82573319232c3385c6128c94c097a05545f93ead (diff) | |
| download | qt-creator-83582b2d57546071d0ce99cd405dd4a6dbd3f963.tar.gz | |
Merge remote-tracking branch 'origin/3.3' into 3.4
Diffstat (limited to 'src/plugins/diffeditor/diffeditor.cpp')
0 files changed, 0 insertions, 0 deletions