← Back to branch summary

~nataliabidart/ubuntuone-control-panel/disable-files

~nataliabidart/ubuntuone-control-panel/disable-files

Viewing all changes in revision 119.

Committer: Natalia B. Bidart
Date: 2011-04-01 20:05:07 UTC
mfrom: (117.1.5 ubuntuone-control-panel)
Revision ID: natalia.bidart@canonical.com-20110401200507-9hl6n7pg5spwelaz

Merged trunk in.

files added:
ubuntuone/controlpanel/integrationtests/test_gui_service.py

files modified:
bin/ubuntuone-control-panel-gtk

ubuntuone/controlpanel/backend.py

ubuntuone/controlpanel/dbus_client.py

ubuntuone/controlpanel/dbus_service.py

ubuntuone/controlpanel/gtk/__init__.py

ubuntuone/controlpanel/gtk/gui.py

ubuntuone/controlpanel/gtk/tests/__init__.py

ubuntuone/controlpanel/gtk/tests/test_gui_basic.py

ubuntuone/controlpanel/tests/__init__.py

ubuntuone/controlpanel/tests/test_backend.py

ubuntuone/controlpanel/webclient.py

Show diffs side-by-side

added added

removed removed

bin/ubuntuone-control-panel-gtk

ubuntuone/controlpanel/backend.py

ubuntuone/controlpanel/dbus_client.py

ubuntuone/controlpanel/dbus_service.py

ubuntuone/controlpanel/gtk/__init__.py

ubuntuone/controlpanel/gtk/gui.py

ubuntuone/controlpanel/gtk/tests/__init__.py

ubuntuone/controlpanel/gtk/tests/test_gui_basic.py

ubuntuone/controlpanel/integrationtests/test_gui_service.py

ubuntuone/controlpanel/tests/__init__.py

ubuntuone/controlpanel/tests/test_backend.py

ubuntuone/controlpanel/webclient.py

Older »