← Back to branch summary

~artmello/gallery-app/gallery-app-not_display_video

~artmello/gallery-app/gallery-app-not_display_video

Viewing all changes in revision 916.

Committer: Ugo Riboni
Date: 2014-02-17 09:25:08 UTC
mfrom: (912.1.5 gallery-app)
Revision ID: ugo.riboni@canonical.com-20140217092508-j28sipnitjg7b2v3

Merge changes from trunk

files modified:
debian/changelog

desktop/gallery-app.desktop.in

rc/qml/GalleryApplication.qml

rc/qml/MainScreen.qml

rc/qml/MediaViewer/PhotoViewerDelegate.qml

src/gallery-application.cpp

src/gallery-application.h

tests/autopilot/gallery_app/emulators/photo_viewer.py

tests/autopilot/gallery_app/tests/test_photo_viewer.py

tests/autopilot/gallery_app/tests/test_photos_view.py

Show diffs side-by-side

added added

removed removed

debian/changelog

desktop/gallery-app.desktop.in

rc/qml/GalleryApplication.qml

rc/qml/MainScreen.qml

rc/qml/MediaViewer/PhotoViewerDelegate.qml

src/gallery-application.cpp

src/gallery-application.h

tests/autopilot/gallery_app/emulators/photo_viewer.py

tests/autopilot/gallery_app/tests/test_photo_viewer.py

tests/autopilot/gallery_app/tests/test_photos_view.py

Older »