diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:14:35 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:14:36 +0200 |
commit | c1520e8aeb0ff56cd5f00ed454babab2d5c8234a (patch) | |
tree | d032ed62cb1d7648fcd83c21cf02322ad79e89c7 /src/multimediawidgets | |
parent | 680c9cab916491cdc4310df5f87c946a50f606b4 (diff) | |
parent | c74b544610376c753ea0a29ff2465e2bcfe70e1d (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: If52332b72560d21069e24cd31b13f08f33e1f406
Diffstat (limited to 'src/multimediawidgets')
0 files changed, 0 insertions, 0 deletions