diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:21:32 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:22:22 +0200 |
| commit | 00c072bf0eb25104086eb43e860e038af5f5d340 (patch) | |
| tree | ead5b949d0a8314bdfd62dfe6fe900e27025c685 /examples/multimediawidgets | |
| parent | a2303617ea8d2cb118d0edc5e4b743d7c4dc8dfc (diff) | |
| parent | 8a047ef087cebba5953ad3ed7b2d99df7966b695 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/unit/qaudioformat/tst_qaudioformat.cpp
Change-Id: I8499473569df9eac8c7069160e42ed477dacad4d
Diffstat (limited to 'examples/multimediawidgets')
0 files changed, 0 insertions, 0 deletions