← Back to branch summary

~bfiller/gallery-app/silo-17-fixes

~bfiller/gallery-app/silo-17-fixes

Viewing all changes in revision 998.

Committer: Bill Filler
Date: 2014-06-18 16:25:52 UTC
mfrom: (991.2.11 gallery-app-remove_photo_from_album)
Revision ID: bill.filler@canonical.com-20140618162552-czic7csmleoqrw8z

merge

files modified:
rc/qml/MediaViewer/MediaViewer.qml

src/qml/qml-media-collection-model.cpp

src/qml/qml-media-collection-model.h

tests/autopilot/gallery_app/emulators/album_view.py

tests/autopilot/gallery_app/emulators/gallery_utils.py

tests/autopilot/gallery_app/tests/test_album_view.py

Show diffs side-by-side

added added

removed removed

rc/qml/MediaViewer/MediaViewer.qml

src/qml/qml-media-collection-model.cpp

src/qml/qml-media-collection-model.h

tests/autopilot/gallery_app/emulators/album_view.py

tests/autopilot/gallery_app/emulators/gallery_utils.py

tests/autopilot/gallery_app/tests/test_album_view.py

Older »