diff options
author | Eike Ziller <eike.ziller@qt.io> | 2018-09-27 09:07:07 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2018-09-27 09:07:07 +0200 |
commit | 6507db19e481a60441478588f47d6f6b8689923f (patch) | |
tree | eab50de52aad3bc49510cbbc7c2415cea0d55da6 /src/plugins/diffeditor/diffeditorfactory.h | |
parent | 6f56feef29af3f6d6ff7bc490f825550d75d2a9c (diff) | |
parent | 8d609692b397f2fad522ec35a430f92bf691f44d (diff) | |
download | qt-creator-6507db19e481a60441478588f47d6f6b8689923f.tar.gz |
Merge remote-tracking branch 'origin/4.7' into 4.8
Change-Id: Ia215af4ddad73053582284d3ce8d56b92dbbc8f3
Diffstat (limited to 'src/plugins/diffeditor/diffeditorfactory.h')
0 files changed, 0 insertions, 0 deletions