diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-17 09:47:01 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-17 09:47:01 +0100 |
| commit | cb97b2ee97a8fddbd94699ebfdf32d2127948aa4 (patch) | |
| tree | 2bfcc777ad86bd361dd88429ba349caaae5e2646 /src/plugins/diffeditor/diffeditorplugin.cpp | |
| parent | 2765409d2bdc79753f96bf6bb894b2884ac5b0cd (diff) | |
| parent | d6ee830ec183f60c66823374669ee0326c9ec9b9 (diff) | |
| download | qt-creator-cb97b2ee97a8fddbd94699ebfdf32d2127948aa4.tar.gz | |
Merge remote-tracking branch 'origin/master' into 4.6
Change-Id: I5e73b7e3cc7281e66c699d03f5ab3f92915d0f21
Diffstat (limited to 'src/plugins/diffeditor/diffeditorplugin.cpp')
0 files changed, 0 insertions, 0 deletions