diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-09-27 15:42:16 +0300 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2015-09-30 10:01:44 +0000 |
commit | 7740c31746efc7eabb74ed22802f8c88711a0aba (patch) | |
tree | 188b05e7d0f6fdfd7ee6619efc998bea9610f482 /src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.cpp | |
parent | 6dca1499ac867a3a66d5d1210918ec1f8ff0652c (diff) | |
download | qt-creator-7740c31746efc7eabb74ed22802f8c88711a0aba.tar.gz |
Git: Increase delay for mergetool
On Windows it takes more than 500ms to retrieve the first line.
Really wait until we have an entire line then read.
Change-Id: I9f7c222c314ea977179ed549281ef145ba756c73
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.cpp')
0 files changed, 0 insertions, 0 deletions