← Back to branch summary

~nataliabidart/magicicada-client/clean-pos-ins

~nataliabidart/magicicada-client/clean-pos-ins

Viewing all changes in revision 1444.

Committer: Natalia
Date: 2018-03-08 20:22:21 UTC
mfrom: (1429.4.6 magicicada-client)
Revision ID: natalia.bidart@ubuntu.com-20180308202221-8ajtrrvh2z6a4emy

Merged trunk in.

files modified:
ubuntuone/networkstate/networkstates.py

ubuntuone/platform/filesystem_notifications/pyinotify_agnostic.py

ubuntuone/platform/os_helper/windows.py

ubuntuone/platform/sync_menu/linux.py

ubuntuone/platform/tests/ipc/test_perspective_broker.py

ubuntuone/platform/tests/os_helper/test_os_helper.py

ubuntuone/platform/tools/__init__.py

ubuntuone/syncdaemon/filesystem_notifications.py

ubuntuone/syncdaemon/fsm/fsm.py

ubuntuone/syncdaemon/local_rescan.py

ubuntuone/syncdaemon/tests/fsm/test_fsm_run.py

ubuntuone/syncdaemon/tests/test_action_queue.py

ubuntuone/syncdaemon/tests/test_eventqueue.py

ubuntuone/syncdaemon/tests/test_localrescan.py

ubuntuone/utils/tests/test_tcpactivation.py

Show diffs side-by-side

added added

removed removed

ubuntuone/networkstate/networkstates.py

ubuntuone/platform/filesystem_notifications/pyinotify_agnostic.py

ubuntuone/platform/os_helper/windows.py

ubuntuone/platform/sync_menu/linux.py

ubuntuone/platform/tests/ipc/test_perspective_broker.py

ubuntuone/platform/tests/os_helper/test_os_helper.py

ubuntuone/platform/tools/__init__.py

ubuntuone/syncdaemon/filesystem_notifications.py

ubuntuone/syncdaemon/fsm/fsm.py

ubuntuone/syncdaemon/local_rescan.py

ubuntuone/syncdaemon/tests/fsm/test_fsm_run.py

ubuntuone/syncdaemon/tests/test_action_queue.py

ubuntuone/syncdaemon/tests/test_eventqueue.py

ubuntuone/syncdaemon/tests/test_localrescan.py

ubuntuone/utils/tests/test_tcpactivation.py

Older »