← Back to branch summary

~xavi-garcia-mena/keeper/fixed-dbus-interfaces-connections-to-use-libqtdbustestrunner

~xavi-garcia-mena/keeper/fixed-dbus-interfaces-connections-to-use-libqtdbustestrunner

Viewing all changes in revision 97.

Committer: Charles Kerr
Author(s): Marcus Tomlinson
Date: 2016-08-29 21:07:30 UTC
mfrom: (91.4.17 qml-plugin)
Revision ID: charles.kerr@canonical.com-20160829210730-dpeufi81evkqfu3j

merge lp:~marcustomlinson/keeper/qml-plugin

files added:
debian/qml-keeper.install

src/client/qml-plugin

src/client/qml-plugin/CMakeLists.txt

src/client/qml-plugin/plugin.cpp

src/client/qml-plugin/plugin.h

src/client/qml-plugin/qmldir

files modified:
CMakeLists.txt

debian/changelog

debian/control

include/client/client.h

src/cli/main.cpp

src/client/CMakeLists.txt

src/client/client.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/qml-keeper.install

include/client/client.h

src/cli/main.cpp

src/client/CMakeLists.txt

src/client/client.cpp

src/client/qml-plugin/

src/client/qml-plugin/CMakeLists.txt

src/client/qml-plugin/plugin.cpp

src/client/qml-plugin/plugin.h

src/client/qml-plugin/qmldir

Older »