diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:50:11 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:50:11 +0200 |
| commit | 9785766067aea72da13b1c7821295254d4fabb78 (patch) | |
| tree | 566c94b7074fbbffaf18e01eaf0c4f988744c712 /src/multimedia/audio/qaudiooutput_alsa_p.cpp | |
| parent | 0ef52f01029176a8fb8fbef2c22ae9350635ebe1 (diff) | |
| parent | 3d45b9147ec93c4af38aef5e6ab2302681bb1425 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I62a3095e4a4d507de199fac32b64e9e76323bbf4
Diffstat (limited to 'src/multimedia/audio/qaudiooutput_alsa_p.cpp')
0 files changed, 0 insertions, 0 deletions