← Back to branch summary

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

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

Viewing all changes in revision 42.

Committer: Guenter Schwann
Date: 2013-09-20 08:19:40 UTC
mfrom: (35.1.6 trunk)
Revision ID: guenter.schwann@canonical.com-20130920081940-5q49lji4osm9rk5k

Trunk merged

files added:
cmake/GSettings.cmake

src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml

src/com/ubuntu/content/service/content-hub.hook.in

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

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

src/com/ubuntu/content/service/hook.h

files modified:
CMakeLists.txt

debian/changelog

debian/content-hub.install

debian/control

src/com/ubuntu/content/CMakeLists.txt

src/com/ubuntu/content/common.h

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

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

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

src/com/ubuntu/content/hub.cpp

src/com/ubuntu/content/service/CMakeLists.txt

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

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

src/com/ubuntu/content/service/registry.h

src/com/ubuntu/content/utils.cpp

tests/acceptance-tests/app_hub_communication_handler.cpp

tests/acceptance-tests/app_hub_communication_known_peers.cpp

tests/qml-tests/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

cmake/GSettings.cmake

debian/changelog

debian/content-hub.install

src/com/ubuntu/content/CMakeLists.txt

src/com/ubuntu/content/common.h

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

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

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

src/com/ubuntu/content/hub.cpp

src/com/ubuntu/content/service/CMakeLists.txt

src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml

src/com/ubuntu/content/service/content-hub.hook.in

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

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

src/com/ubuntu/content/service/hook.h

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

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

src/com/ubuntu/content/service/registry.h

src/com/ubuntu/content/utils.cpp

tests/acceptance-tests/app_hub_communication_handler.cpp

tests/acceptance-tests/app_hub_communication_known_peers.cpp

tests/qml-tests/CMakeLists.txt

Older »