diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-20 15:53:34 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-21 14:03:11 +0200 |
| commit | 7a5e3145550015c9c6c3e8232c8257099aa2480c (patch) | |
| tree | 0b5623c19c6d2ac39a9d95befcadc957029a2446 /src/gsttools | |
| parent | 631b89ddde44dfc8b72b904d8c41368b2c02d037 (diff) | |
| parent | 17d54a2eb57816dbc531feee80dbd25f835e733a (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/plugins/directshow/player/directshowiosource.cpp
One side disintermediated filling a vector; the other reduced it to one entry.
src/plugins/directshow/player/directshowiosource.h
One side renamed a member, the other added another adjacent to it.
src/plugins/pulseaudio/qpulseaudioengine.h
One side added a header, the other replaced the next with a different header.
Change-Id: I3a031975f5af43ca39cca571f215c612f640b7d6
Diffstat (limited to 'src/gsttools')
0 files changed, 0 insertions, 0 deletions