summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia/Video.qml
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-04-05 09:47:27 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-05 09:47:27 +0200
commit03ae7a5b7d6956ab8de2d7f3d05b9cc00e70f69b (patch)
tree13fe41c91db7c10e9ac5db736892fe0f5075e6fd /src/imports/multimedia/Video.qml
parent7a4ea3035087d6eafe96f8ec304bef95b3a74ea0 (diff)
parent56e2833bd5d5df8e7289267b4d5d993a0cab99a2 (diff)
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/imports/multimedia/Video.qml')
0 files changed, 0 insertions, 0 deletions