← Back to branch summary

~verterok/ubuntuone-client/volumemanager_udfs-2

~verterok/ubuntuone-client/volumemanager_udfs-2

Viewing all changes in revision 296.

Committer: guillermo.gonzalez at canonical
Date: 2010-01-04 18:54:17 UTC
mfrom: (294.2.6 trunk)
Revision ID: guillermo.gonzalez@canonical.com-20100104185417-is0onxq4znx57u0j

merge with trunk

files added:
nautilus/ubuntuone-marshallers.list

files modified:
bin/ubuntuone-syncdaemon

contrib/test

contrib/testing/testcase.py

data/syncdaemon.conf

nautilus/Makefile.am

nautilus/ubuntuone-nautilus.c

po/POTFILES.skip

tests/syncdaemon/test_config.py

tests/syncdaemon/test_dbus.py

tests/syncdaemon/test_hashqueue.py

tests/syncdaemon/test_tools.py

ubuntuone/syncdaemon/config.py

ubuntuone/syncdaemon/dbus_interface.py

ubuntuone/syncdaemon/logger.py

ubuntuone/syncdaemon/main.py

Show diffs side-by-side

added added

removed removed

bin/ubuntuone-syncdaemon

contrib/testing/testcase.py

data/syncdaemon.conf

nautilus/Makefile.am

nautilus/ubuntuone-marshallers.list

nautilus/ubuntuone-nautilus.c

po/POTFILES.skip

tests/syncdaemon/test_config.py

tests/syncdaemon/test_dbus.py

tests/syncdaemon/test_hashqueue.py

tests/syncdaemon/test_tools.py

ubuntuone/syncdaemon/config.py

ubuntuone/syncdaemon/dbus_interface.py

ubuntuone/syncdaemon/logger.py

ubuntuone/syncdaemon/main.py

Older »