Commit 7a5e3145 authored by Edward Welbourne's avatar Edward Welbourne
Browse files

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
Showing with 551 additions and 145 deletions
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment