← Back to branch summary

~mandel/ubuntu-sso-client/choose_correct_ui_module

~mandel/ubuntu-sso-client/choose_correct_ui_module

Viewing all changes in revision 767.

Committer: Manuel de la Pena
Date: 2011-04-13 08:19:53 UTC
mfrom: (675.9.10 ubuntu-sso-client)
Revision ID: mandel@themacaque.com-20110413081953-chpbrz6ig4fomq3n

Fix conflicts with the merges.

files modified:
data/qt/setup_account.ui

setup.py

ubuntu_sso/qt/controllers.py

ubuntu_sso/qt/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/test_windows.py

ubuntu_sso/utils/ui.py

Older »