← Back to branch summary

~xavi-garcia-mena/keeper/sf-errors-dbus-interface

~xavi-garcia-mena/keeper/sf-errors-dbus-interface

Viewing all changes in revision 115.

Committer: Xavi Garcia Mena
Date: 2016-09-30 09:27:04 UTC
mfrom: (112.1.2 keeper-cancel)
Revision ID: xavi.garcia.mena@canonical.com-20160930092704-rs9bo5vutpwsascg

merge lp:~xavi-garcia-mena/keeper/cancel-feature

files modified:
src/service/keeper-task.cpp

src/service/keeper-task.h

src/service/keeper-user.cpp

src/service/keeper.cpp

src/service/keeper.h

src/service/private/keeper-task_p.h

src/service/task-manager.cpp

src/service/task-manager.h

tests/integration/helpers/helpers-test.cc

tests/integration/helpers/test-helpers-base.cpp

tests/integration/helpers/test-helpers-base.h

Show diffs side-by-side

added added

removed removed

src/service/keeper-task.cpp

src/service/keeper-task.h

src/service/keeper-user.cpp

src/service/keeper.cpp

src/service/keeper.h

src/service/private/keeper-task_p.h

src/service/task-manager.cpp

src/service/task-manager.h

tests/integration/helpers/helpers-test.cc

tests/integration/helpers/test-helpers-base.cpp

tests/integration/helpers/test-helpers-base.h

Older »