← Back to branch summary

~diegosarmentero/ubuntuone-control-panel/reconnect-button

~diegosarmentero/ubuntuone-control-panel/reconnect-button

Viewing all changes in revision 260.

Committer: Diego Sarmentero
Date: 2012-02-17 12:01:56 UTC
mfrom: (255.3.6 ubuntuone-control-panel-connect-button)
Revision ID: diego.sarmentero@canonical.com-20120217120156-vsbmrrqddr2r8jta

merge

files added:
data/sync_status_loading.png

files modified:
data/qt/filesyncstatus.ui

data/qt/images.qrc

ubuntuone/controlpanel/gui/__init__.py

ubuntuone/controlpanel/gui/qt/filesyncstatus.py

ubuntuone/controlpanel/gui/qt/tests/__init__.py

ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py

Show diffs side-by-side

added added

removed removed

data/qt/filesyncstatus.ui

data/qt/images.qrc

data/sync_status_loading.png

ubuntuone/controlpanel/gui/__init__.py

ubuntuone/controlpanel/gui/qt/filesyncstatus.py

ubuntuone/controlpanel/gui/qt/tests/__init__.py

ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py

Older »