summaryrefslogtreecommitdiff
path: root/src/multimedia/video
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-06-11 10:05:00 +0200
committerSergio Ahumada <sahumada@blackberry.com>2014-06-11 10:05:00 +0200
commit150ff6662de1312e3ba9d000895d80dd5805ea5b (patch)
tree6f9fc0289c329022551bcc54ff6279974c9599eb /src/multimedia/video
parentd71aaca893a27a8a9a6712a59313300b87226a4f (diff)
parentb99a4b3025f08df8f33efb02897397ae5e404acf (diff)
downloadqtmultimedia-150ff6662de1312e3ba9d000895d80dd5805ea5b.tar.gz
Merge remote-tracking branch 'origin/stable' into 5.3
Change-Id: I689554fb6e47b8183013de271a776909a05398dc
Diffstat (limited to 'src/multimedia/video')
0 files changed, 0 insertions, 0 deletions