diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 16:12:44 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 16:12:44 +0100 |
commit | eddc8e1e58c0377ae392409d9afccea91ba1cd22 (patch) | |
tree | 652a9c8229ce8b5137093e2ee82e2a83c6975b91 /src/multimediawidgets | |
parent | c3f5a15f24f4421e0a096b2272273d9a85f70851 (diff) | |
parent | 2020b032e83d1b61736a80a6815635aa7451deed (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Id87e56ccfc9f33f98c3d06991f6fe9c14d38fbac
Diffstat (limited to 'src/multimediawidgets')
0 files changed, 0 insertions, 0 deletions