← Back to branch summary

~tcole/ubuntuone-client/request-queue-predicates

~tcole/ubuntuone-client/request-queue-predicates

Viewing all changes in revision 165.

Committer: tim.cole at canonical
Date: 2009-08-22 00:50:15 UTC
mfrom: (160.2.10 trunk)
Revision ID: tim.cole@canonical.com-20090822005015-6tdpcitod026r6z2

merge from trunk

files added:
tests/syncdaemon/test_action_queue.py

files modified:
contrib/testing/testcase.py

nautilus/ubuntuone-nautilus.c

tests/syncdaemon/test_dbus.py

tests/syncdaemon/test_sync.py

ubuntuone/syncdaemon/action_queue.py

ubuntuone/syncdaemon/dbus_interface.py

ubuntuone/syncdaemon/main.py

ubuntuone/syncdaemon/state.py

ubuntuone/u1sync/client.py

ubuntuone/u1sync/main.py

Show diffs side-by-side

added added

removed removed

contrib/testing/testcase.py

nautilus/ubuntuone-nautilus.c

tests/syncdaemon/test_action_queue.py

tests/syncdaemon/test_dbus.py

tests/syncdaemon/test_sync.py

ubuntuone/syncdaemon/action_queue.py

ubuntuone/syncdaemon/dbus_interface.py

ubuntuone/syncdaemon/main.py

ubuntuone/syncdaemon/state.py

ubuntuone/u1sync/client.py

ubuntuone/u1sync/main.py

Older »