← Back to branch summary

~checkbox-dev/checkbox/trunk

~checkbox-dev/checkbox/trunk

Viewing all changes in revision 4127.

Committer: Sylvain Pineau
Author(s): Maciej Kisielewski
Date: 2015-12-10 12:51:05 UTC
mfrom: (4116.5.8 launchpad/fix-1493469-mandatory-in-converged)
Revision ID: sylvain_pineau-20151210125105-ea13019uyb7z6m0h

"automatic merge of lp:~kissiel/checkbox/fix-1493469-mandatory-in-converged/ by tarmac [r=sylvain-pineau][bug=1493469][author=kissiel]"

files modified:
checkbox-touch/components/SelectionPage.qml

checkbox-touch/py/checkbox_touch.py

checkbox-touch/tests/autopilot/autopilot-provider/units/autopilot.pxu

checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py

checkbox-touch/tests/autopilot/checkbox_touch/test_sudo_tests.py

plainbox/plainbox/impl/session/assistant.py

plainbox/plainbox/impl/session/state.py

Show diffs side-by-side

added added

removed removed

checkbox-touch/components/SelectionPage.qml

checkbox-touch/py/checkbox_touch.py

checkbox-touch/tests/autopilot/autopilot-provider/units/autopilot.pxu

checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py

checkbox-touch/tests/autopilot/checkbox_touch/test_sudo_tests.py

plainbox/plainbox/impl/session/assistant.py

plainbox/plainbox/impl/session/state.py

Older »