← Back to branch summary

~diegosarmentero/ubuntuone-control-panel/mouse-events

~diegosarmentero/ubuntuone-control-panel/mouse-events

Viewing all changes in revision 361.

Committer: Diego Sarmentero
Date: 2012-09-28 18:50:03 UTC
mfrom: (359.1.3 ubuntuone-control-panel-not-reshare)
Revision ID: diego.sarmentero@canonical.com-20120928185003-1ir7pcpvdmude4lb

merge

files modified:
ubuntuone/controlpanel/gui/qt/share_file.py

ubuntuone/controlpanel/gui/qt/share_links.py

ubuntuone/controlpanel/gui/qt/share_links_search.py

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

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

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

Show diffs side-by-side

added added

removed removed

ubuntuone/controlpanel/gui/qt/share_file.py

ubuntuone/controlpanel/gui/qt/share_links.py

ubuntuone/controlpanel/gui/qt/share_links_search.py

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

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

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

Older »