← Back to branch summary

~schwann/content-hub/content-export-component

~schwann/content-hub/content-export-component

Viewing all changes in revision 46.

Committer: Guenter Schwann
Date: 2013-09-24 16:36:09 UTC
mfrom: (35.1.8 trunk)
Revision ID: guenter.schwann@canonical.com-20130924163609-gmowktgqa6d0fi6g

Trunk merged

files added:
import/Ubuntu/Content/contentstore.cpp

import/Ubuntu/Content/contentstore.h

tests/acceptance-tests/test_utils.cpp

files modified:
debian/changelog

examples/import-qml/import.qml

examples/importer/example.cpp

examples/importer/exampleimporter.cpp

import/Ubuntu/Content/CMakeLists.txt

import/Ubuntu/Content/contenthub.cpp

import/Ubuntu/Content/contenthub.h

import/Ubuntu/Content/contenthubplugin.cpp

import/Ubuntu/Content/contenttransfer.cpp

import/Ubuntu/Content/contenttransfer.h

include/com/ubuntu/content/store.h

include/com/ubuntu/content/transfer.h

src/com/ubuntu/content/detail/com.ubuntu.content.Transfer.xml

src/com/ubuntu/content/detail/service.cpp

src/com/ubuntu/content/detail/transfer.cpp

src/com/ubuntu/content/detail/transfer.h

src/com/ubuntu/content/hub.cpp

src/com/ubuntu/content/service/main.cpp

src/com/ubuntu/content/store.cpp

src/com/ubuntu/content/transfer.cpp

src/com/ubuntu/content/transfer_p.h

src/com/ubuntu/content/utils.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/app_hub_communication_transfer.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

examples/import-qml/import.qml

examples/importer/example.cpp

examples/importer/exampleimporter.cpp

import/Ubuntu/Content/CMakeLists.txt

import/Ubuntu/Content/contenthub.cpp

import/Ubuntu/Content/contenthub.h

import/Ubuntu/Content/contenthubplugin.cpp

import/Ubuntu/Content/contentstore.cpp

import/Ubuntu/Content/contentstore.h

import/Ubuntu/Content/contenttransfer.cpp

import/Ubuntu/Content/contenttransfer.h

include/com/ubuntu/content/store.h

include/com/ubuntu/content/transfer.h

src/com/ubuntu/content/detail/com.ubuntu.content.Transfer.xml

src/com/ubuntu/content/detail/service.cpp

src/com/ubuntu/content/detail/transfer.cpp

src/com/ubuntu/content/detail/transfer.h

src/com/ubuntu/content/hub.cpp

src/com/ubuntu/content/service/main.cpp

src/com/ubuntu/content/store.cpp

src/com/ubuntu/content/transfer.cpp

src/com/ubuntu/content/transfer_p.h

src/com/ubuntu/content/utils.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/app_hub_communication_transfer.cpp

tests/acceptance-tests/test_utils.cpp

Older »