diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-19 09:50:11 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-19 09:50:11 +0100 |
| commit | 02b8c7527a88d1cfaed296b856fce63fd62a6c9e (patch) | |
| tree | 145ab0eb1bee64b07097279360c3bd66ab061c59 /src/plugins/opensles | |
| parent | c9a841a37614cc2b4f70df935fc097d4627f04a3 (diff) | |
| parent | 8d84a30e4d5ebec6e9c921ca855fc0cc5f1d9269 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I01940fe4f3d059fbb425492a1748e2b5d9b6804b
Diffstat (limited to 'src/plugins/opensles')
0 files changed, 0 insertions, 0 deletions