← Back to branch summary

~brendan-donegan/checkbox/bug1196531

~brendan-donegan/checkbox/bug1196531

Viewing all changes in revision 2201.

Committer: Tarmac
Author(s): Zygmunt Krynicki
Date: 2013-06-21 14:14:16 UTC
mfrom: (2199.1.11 launchpad/misc)
Revision ID: tarmac-20130621141416-hv12juje6qdwfbes

"[r=roadmr][bug=][author=zkrynicki] automatic merge by tarmac"

files modified:
checkbox-ng/checkbox_ng/test_main.py

plainbox/plainbox/impl/box.py

plainbox/plainbox/impl/checkbox.py

plainbox/plainbox/impl/logging.py

plainbox/plainbox/impl/plugins.py

plainbox/plainbox/impl/provider.py

plainbox/plainbox/impl/test_box.py

Show diffs side-by-side

added added

removed removed

checkbox-ng/checkbox_ng/test_main.py

plainbox/plainbox/impl/box.py

plainbox/plainbox/impl/checkbox.py

plainbox/plainbox/impl/logging.py

plainbox/plainbox/impl/plugins.py

plainbox/plainbox/impl/provider.py

plainbox/plainbox/impl/test_box.py

Older »