diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-08-24 14:31:24 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-08-24 14:36:13 +0200 |
| commit | a2244c9b7aa11e386c3331cbbc36336fb8fea3b9 (patch) | |
| tree | a77ac99aa38c40e98aa483795e3cb8061f404203 /.gitignore | |
| parent | 31fce88b3fcdbb4d4b2b9a889d24e25c3a5c9507 (diff) | |
| parent | 008d20e0ece4c6dac148915b998a0005657d73a1 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/imports/multimedia/qdeclarativeaudio.cpp
Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions