diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:48:51 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:48:51 +0100 |
commit | 64b75cc1d7ab1c3a557c809e15154d5d3a03d1ad (patch) | |
tree | fc77380849c882da0dbc3c96f4fbbf92b0c21d33 /src/plugins/pulseaudio/qaudiooutput_pulse.cpp | |
parent | d109e6dd5d6a18e715b979f3d3ef845946b1b787 (diff) | |
parent | d4208cc5a1c6d6bf114653b39b8880fe4c00c1f3 (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: Id24f14bef17b86e7027e055473f0357854780979
Diffstat (limited to 'src/plugins/pulseaudio/qaudiooutput_pulse.cpp')
0 files changed, 0 insertions, 0 deletions