← Back to branch summary

~bfiller/gallery-app/fix-silo-46

~bfiller/gallery-app/fix-silo-46

Viewing all changes in revision 1236.

Committer: Bill Filler
Date: 2015-09-10 17:13:51 UTC
mfrom: (1232.1.10 gallery-app-handle_svg_files)
Revision ID: bill.filler@canonical.com-20150910171351-07wpoaptgvnqpk8y

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

files added:
tests/unittests/mediaobjectfactory/data

tests/unittests/mediaobjectfactory/data/sample01.jpg

tests/unittests/mediaobjectfactory/data/sample02.svg

files modified:
debian/control

src/media-object-factory.cpp

tests/unittests/mediaobjectfactory/CMakeLists.txt

tests/unittests/mediaobjectfactory/tst_mediaobjectfactory.cpp

tests/unittests/stubs/photo_stub.cpp

tests/unittests/stubs/video_stub.cpp

Show diffs side-by-side

added added

removed removed

src/media-object-factory.cpp

tests/unittests/mediaobjectfactory/CMakeLists.txt

tests/unittests/mediaobjectfactory/data/

tests/unittests/mediaobjectfactory/data/sample01.jpg

tests/unittests/mediaobjectfactory/data/sample02.svg

tests/unittests/mediaobjectfactory/tst_mediaobjectfactory.cpp

tests/unittests/stubs/photo_stub.cpp

tests/unittests/stubs/video_stub.cpp

Older »