← Back to branch summary

~bfiller/gallery-app/gallery-app-46-new

~bfiller/gallery-app/gallery-app-46-new

Viewing all changes in revision 1256.

Committer: Bill Filler
Date: 2015-12-16 22:05:45 UTC
mfrom: (1254.1.9 gallery-app-fix_1517655)
Revision ID: bill.filler@canonical.com-20151216220545-mgkbn3ipj2703q6y

merge lp:~artmello/gallery-app/gallery-app-fix_1517655

files modified:
rc/qml/MainScreen.qml

rc/qml/OrganicView/OrganicView.qml

rc/qml/PhotosOverview.qml

src/content-communicator.cpp

src/media-object-factory.cpp

src/medialoader/video-metadata.cpp

src/medialoader/video-metadata.h

tests/unittests/mediaobjectfactory/tst_mediaobjectfactory.cpp

Show diffs side-by-side

added added

removed removed

rc/qml/MainScreen.qml

rc/qml/OrganicView/OrganicView.qml

rc/qml/PhotosOverview.qml

src/content-communicator.cpp

src/media-object-factory.cpp

src/medialoader/video-metadata.cpp

src/medialoader/video-metadata.h

tests/unittests/mediaobjectfactory/tst_mediaobjectfactory.cpp

Older »