diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-11-27 14:44:33 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-11-27 14:44:49 +0100 |
| commit | 7e3d69668e3f04110a651dee1850a1d0c885947b (patch) | |
| tree | e55041237e21735e0849cb25aabf37937d6ea809 /qtmultimedia.pro | |
| parent | eddc8e1e58c0377ae392409d9afccea91ba1cd22 (diff) | |
| parent | 59f2bf186400241c62a02044265d9ecab81c1749 (diff) | |
| download | qtmultimedia-7e3d69668e3f04110a651dee1850a1d0c885947b.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Iaa608643f6626ed074a9fd374555cc5bc84659d5
Diffstat (limited to 'qtmultimedia.pro')
0 files changed, 0 insertions, 0 deletions