← Back to branch summary

~om26er/gallery-app/fix_selection_test

~om26er/gallery-app/fix_selection_test

« back to all changes in this revision

Viewing changes to tests/autopilot/gallery_app/data/option01/video.mkv

Committer: Bill Filler
Date: 2014-04-04 16:34:27 UTC
mfrom: (918.3.27 gallery-app-album-nav)
Revision ID: bill.filler@canonical.com-20140404163427-5yjg1t2tkv6ykou1

merge

files added:
tests/autopilot/gallery_app/data/default/sample03.jpg

tests/autopilot/gallery_app/data/default/sample04.jpg

tests/autopilot/gallery_app/data/default/sample05.jpg

tests/autopilot/gallery_app/data/option01/video.mkv

tests/autopilot/gallery_app/data/option01/video.mp4

tests/autopilot/gallery_app/emulators/events_view.py

files removed:
tests/autopilot/gallery_app/data/option01/clip_0001.mkv

tests/autopilot/gallery_app/data/option01/video20130618_0002.mp4

files modified:
rc/js/GraphicsRoutines.js

rc/qml/AlbumViewer/AlbumInternals/AlbumPageContents.qml

rc/qml/AlbumViewer/AlbumViewer.qml

rc/qml/AlbumViewer/AlbumViewerTransition.qml

rc/qml/OrganicView/OrganicView.qml

tests/autopilot/gallery_app/data/default/.database/gallery.sqlite

tests/autopilot/gallery_app/emulators/album_view.py

tests/autopilot/gallery_app/emulators/gallery_utils.py

tests/autopilot/gallery_app/tests/__init__.py

tests/autopilot/gallery_app/tests/test_album_view.py

tests/autopilot/gallery_app/tests/test_albums_view.py

tests/autopilot/gallery_app/tests/test_events_view.py

tests/autopilot/gallery_app/tests/test_photo_viewer.py

Show diffs side-by-side

added added

removed removed

tests/autopilot/gallery_app/data/option01/video.mkv

Older »