« back to all changes in this revision
Viewing changes to tests/qmltests/Components/tst_LazyImage/wide.png
- Committer: Josh Arenson
- Date: 2016-06-29 14:44:41 UTC
- mfrom: (1789.412.85 unity8)
- Revision ID: joshua.arenson@canonical.com-20160629144441-du2vd7vu97b2n8pc
Merge trunk
- files added:
- qml/Components/MediaServices
- files renamed:
- qml/Dash/Previews/PreviewSharing.qml => qml/Components/SharingPicker.qml
- tests/mocks/QtMultimedia/audio.cpp => tests/mocks/QtMultimedia/mediaplayer.cpp
- tests/mocks/QtMultimedia/audio.h => tests/mocks/QtMultimedia/mediaplayer.h
- tests/qmltests/Dash/Previews/tst_PreviewSharing.qml => tests/qmltests/Components/tst_SharingPicker.qml
- files modified:
- build.sh
added
removed
tests/qmltests/Components/tst_LazyImage/wide.png
