diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:10:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:10:15 +0200 |
| commit | 112595bf80ff0e0ed57f73d8efb628aaa0aa8dff (patch) | |
| tree | 97597190310d7f17788fb27722e0e27073125350 /tests/auto/integration/qsoundeffect/BLACKLIST | |
| parent | 86915f01f7efef912513f750e60e73af28823d4d (diff) | |
| parent | 9fdc4a3a635f094557c210408a600dde15a00935 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
Change-Id: Ib38fe1e0a4c937068741a9556748a18e35ba59af
Diffstat (limited to 'tests/auto/integration/qsoundeffect/BLACKLIST')
0 files changed, 0 insertions, 0 deletions