← Back to branch summary

~alecu/ubuntu-sso-client/changed-secrets-spec

~alecu/ubuntu-sso-client/changed-secrets-spec

Viewing all changes in revision 700.1.1.

Committer: Roberto Alsina
Date: 2011-04-12 16:11:14 UTC
mfrom: (675.20.11 add_windows_ui_root)
mto: (675.20.12 add_windows_ui_root)
mto: This revision was merged to the branch mainline in revision 701.
Revision ID: roberto.alsina@canonical.com-20110412161114-ps26w7gao12it08z

fix merge conflict

files modified:
bin/windows-ubuntu-sso-login

data/qt/setup_account.ui

ubuntu_sso/qt/controllers.py

ubuntu_sso/qt/gui.py

ubuntu_sso/qt/tests/show_gui.py

ubuntu_sso/qt/tests/test_windows.py

ubuntu_sso/utils/ui.py

Show diffs side-by-side

added added

removed removed

data/qt/setup_account.ui

ubuntu_sso/qt/controllers.py

ubuntu_sso/qt/gui.py

ubuntu_sso/qt/tests/show_gui.py

ubuntu_sso/qt/tests/test_windows.py

ubuntu_sso/utils/ui.py

Older »