← Back to branch summary

~diegosarmentero/ubuntuone-windows-installer/wizard-sizes

~diegosarmentero/ubuntuone-windows-installer/wizard-sizes

Viewing all changes in revision 48.

Committer: Diego Sarmentero
Date: 2011-09-06 13:08:52 UTC
mfrom: (44.2.2 ubuntuone-windows-installer-sizes)
Revision ID: diego.sarmentero@canonical.com-20110906130852-pdtvucb9mwxcxyu5

merge.
conflict resolved.

files modified:
data/qt/choose_sign_in.ui

data/qt/congratulations.ui

data/qt/folders.ui

data/qt/license.ui

data/qt/local_folders.ui

data/qt/preferences.ui

data/qt/setup_account.ui

data/qt/side_widget.ui

data/qt/sign_in.ui

data/qt/sync_now_or_later.ui

data/qt/ubuntuone.qss

ubuntuone_installer/gui/qt/__init__.py

ubuntuone_installer/gui/qt/gui.py

ubuntuone_installer/gui/qt/side_widget.py

ubuntuone_installer/gui/qt/tests/test_side_widget.py

Show diffs side-by-side

added added

removed removed

data/qt/choose_sign_in.ui

data/qt/congratulations.ui

data/qt/folders.ui

data/qt/license.ui

data/qt/local_folders.ui

data/qt/preferences.ui

data/qt/setup_account.ui

data/qt/side_widget.ui

data/qt/sign_in.ui

data/qt/sync_now_or_later.ui

data/qt/ubuntuone.qss

ubuntuone_installer/gui/qt/__init__.py

ubuntuone_installer/gui/qt/gui.py

ubuntuone_installer/gui/qt/side_widget.py

ubuntuone_installer/gui/qt/tests/test_side_widget.py

Older »