diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-10-18 13:58:30 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-10-18 13:59:52 +0200 |
| commit | e61833a1e59cea9718d29a954f91dbb1d7dac3c3 (patch) | |
| tree | e5415bd97ba7b21181dc2a8dc048aba08155e496 /src/corelib/tools/qringbuffer.cpp | |
| parent | 45580aa92557caa4f3f5be783573ddb80602e494 (diff) | |
| parent | 542a76c490cee7359f9c5116248977cab72b7b63 (diff) | |
Merge branch 5.8 into dev
Conflicts:
src/plugins/platforms/cocoa/qnsview.mm
Change-Id: I655e8d04cece341e8b9fb69e94c09335ffa108e1
Diffstat (limited to 'src/corelib/tools/qringbuffer.cpp')
0 files changed, 0 insertions, 0 deletions