diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-31 03:00:24 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 10:43:32 +0200 |
| commit | 4378984c44814c0b80bcf1acdabace54bcb2c8c9 (patch) | |
| tree | 642acf7b533f14d982447049c3d12c8d3188b061 /examples/multimedia/audiodevices/audiodevices.pro | |
| parent | a86ac5ba0a5ac06f32da67a12b36eb07db817cca (diff) | |
| parent | 7936c055b6becd8e291a93c1d9955a0f460e2d6c (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I8d0aa330c9e5b2031b40ca645356226e8ebb50c8
Diffstat (limited to 'examples/multimedia/audiodevices/audiodevices.pro')
0 files changed, 0 insertions, 0 deletions