← Back to branch summary

~artmello/gallery-app/gallery-app-crash_removing_files

~artmello/gallery-app/gallery-app-crash_removing_files

Viewing all changes in revision 1036.

Committer: Arthur Mello
Date: 2014-08-13 12:42:32 UTC
mfrom: (1033.1.7 gallery-app)
Revision ID: arthur.mello@canonical.com-20140813124232-8hn2k7metnh6y5e5

Merge with trunk

files modified:
CMakeLists.txt

debian/changelog

po/ja.po

rc/qml/GalleryApplication.qml

rc/qml/MediaViewer/GalleryPhotoComponent.qml

src/gallery-application.cpp

src/gallery-manager.cpp

src/gallery-manager.h

src/medialoader/CMakeLists.txt

src/util/resource.cpp

src/util/resource.h

tests/unittests/mediaobjectfactory/tst_mediaobjectfactory.cpp

tests/unittests/resource/tst_resource.cpp

tests/unittests/stubs/gallery-manager_stub.cpp

tests/unittests/video/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

debian/changelog

rc/qml/GalleryApplication.qml

rc/qml/MediaViewer/GalleryPhotoComponent.qml

src/gallery-application.cpp

src/gallery-manager.cpp

src/gallery-manager.h

src/medialoader/CMakeLists.txt

src/util/resource.cpp

src/util/resource.h

tests/unittests/mediaobjectfactory/tst_mediaobjectfactory.cpp

tests/unittests/resource/tst_resource.cpp

tests/unittests/stubs/gallery-manager_stub.cpp

tests/unittests/video/CMakeLists.txt

Older »