diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-10-05 15:28:04 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-10-05 15:28:04 +0200 |
| commit | 90cf4487a52cbff8389be85b8926afba24d75918 (patch) | |
| tree | d2226523d433f6531ea9aa28c512a6ab454c1f13 /src/plugins/diffeditor/diffeditorplugin.cpp | |
| parent | f036877a0d04681e60cbc010995a8a68c14f89c0 (diff) | |
| parent | 8902fbc62c80896c6fc9316b90b2f6d0cced7491 (diff) | |
| download | qt-creator-90cf4487a52cbff8389be85b8926afba24d75918.tar.gz | |
Merge remote-tracking branch 'origin/4.1'
Conflicts:
src/plugins/autotest/qtest/qttestoutputreader.cpp
Change-Id: I4b323f2f3041d015fa04b9a25ec925f3b3e2411f
Diffstat (limited to 'src/plugins/diffeditor/diffeditorplugin.cpp')
0 files changed, 0 insertions, 0 deletions