← Back to branch summary

~sylvain-pineau/checkbox/jinja_exporter_FileSystemLoader

~sylvain-pineau/checkbox/jinja_exporter_FileSystemLoader

Viewing all changes in revision 3616.

Committer: Daniel Manrique
Author(s): Maciej Kisielewski
Date: 2015-03-16 10:57:43 UTC
mfrom: (3589.5.11 launchpad/story-1241)
Revision ID: daniel_manrique-20150316105743-1lhsq93tz94tt47m

"automatic merge of lp:~kissiel/checkbox/story-1241/ by tarmac [r=sylvain-pineau][bug=][author=kissiel]"

files added:
providers/2015.com.canonical.certification:qml-tests/data/camera-06.qml

files removed:
checkbox-touch/checkbox-touch.desktop

files modified:
.bzrignore

.gitignore

checkbox-touch/build-me

checkbox-touch/components/CheckboxTouchApplication.qml

checkbox-touch/components/QmlNativePage.qml

checkbox-touch/py/checkbox_touch.py

plainbox/plainbox/data/qml-shell/plainbox_qml_shell.qml

plainbox/plainbox/impl/ctrl.py

plainbox/plainbox/impl/test_ctrl.py

plainbox/plainbox/qml_shell/qml_shell.qml

providers/2015.com.canonical.certification:qml-tests/units/qml-tests.pxu

Show diffs side-by-side

added added

removed removed

checkbox-touch/build-me

checkbox-touch/checkbox-touch.desktop

checkbox-touch/components/CheckboxTouchApplication.qml

checkbox-touch/components/QmlNativePage.qml

checkbox-touch/py/checkbox_touch.py

plainbox/plainbox/data/qml-shell/plainbox_qml_shell.qml

plainbox/plainbox/impl/ctrl.py

plainbox/plainbox/impl/test_ctrl.py

plainbox/plainbox/qml_shell/qml_shell.qml

providers/2015.com.canonical.certification:qml-tests/data/camera-06.qml

providers/2015.com.canonical.certification:qml-tests/units/qml-tests.pxu

Older »