← Back to branch summary

~ubuntuone-control-tower/ubuntu/karmic/desktopcouch/snapshots-with-packaging

~ubuntuone-control-tower/ubuntu/karmic/desktopcouch/snapshots-with-packaging

Viewing all changes in revision 9.

Committer: James Westby
Date: 2009-10-14 13:43:23 UTC
mfrom: (1.1.6 upstream)
Revision ID: james.westby@canonical.com-20091014134323-yvov1mrx9xvs1i01

Merging shared upstream rev into target branch.

files added:
config

config/desktop-couch

config/desktop-couch/compulsory-auth.ini

desktopcouch/contacts/schema.txt

desktopcouch/contacts/tests/test_create.py

desktopcouch/notes

desktopcouch/notes/__init__.py

desktopcouch/notes/record.py

desktopcouch/pair/tests/test_couchdb_io.py

desktopcouch/records/doc/field_registry.txt

desktopcouch/records/server_base.py

desktopcouch/replication.py

desktopcouch/replication_services

desktopcouch/replication_services/__init__.py

desktopcouch/replication_services/example.py

desktopcouch/replication_services/ubuntuone.py

po/desktopcouch.pot

files removed:
PKG-INFO

config

config/desktop-couch

config/desktop-couch/compulsory-auth.ini

desktopcouch.egg-info

desktopcouch.egg-info/PKG-INFO

desktopcouch.egg-info/SOURCES.txt

desktopcouch.egg-info/dependency_links.txt

desktopcouch.egg-info/top_level.txt

desktopcouch/contacts/tests/test_create.py

desktopcouch/notes

desktopcouch/notes/__init__.py

desktopcouch/notes/record.py

desktopcouch/pair/tests/test_couchdb_io.py

desktopcouch/records/server_base.py

desktopcouch/replication.py

desktopcouch/replication_services

desktopcouch/replication_services/__init__.py

desktopcouch/replication_services/example.py

desktopcouch/replication_services/ubuntuone.py

files modified:
MANIFEST.in

desktopcouch/local_files.py

desktopcouch/pair/couchdb_pairing/couchdb_io.py

desktopcouch/pair/couchdb_pairing/dbus_io.py

desktopcouch/records/couchgrid.py

desktopcouch/records/doc/records.txt

desktopcouch/records/server.py

desktopcouch/records/tests/test_couchgrid.py

desktopcouch/records/tests/test_field_registry.py

desktopcouch/records/tests/test_record.py

desktopcouch/records/tests/test_server.py *

setup.cfg

setup.py

Show diffs side-by-side

added added

removed removed

config/desktop-couch/

config/desktop-couch/

config/desktop-couch/compulsory-auth.ini

config/desktop-couch/compulsory-auth.ini

desktopcouch.egg-info/

desktopcouch.egg-info/PKG-INFO

desktopcouch.egg-info/SOURCES.txt

desktopcouch.egg-info/dependency_links.txt

desktopcouch.egg-info/top_level.txt

desktopcouch/contacts/schema.txt

desktopcouch/contacts/tests/test_create.py

desktopcouch/contacts/tests/test_create.py

desktopcouch/local_files.py

desktopcouch/notes/

desktopcouch/notes/

desktopcouch/notes/__init__.py

desktopcouch/notes/__init__.py

desktopcouch/notes/record.py

desktopcouch/notes/record.py

desktopcouch/pair/couchdb_pairing/couchdb_io.py

desktopcouch/pair/couchdb_pairing/dbus_io.py

desktopcouch/pair/tests/test_couchdb_io.py

desktopcouch/pair/tests/test_couchdb_io.py

desktopcouch/records/couchgrid.py

desktopcouch/records/doc/field_registry.txt

desktopcouch/records/doc/records.txt

desktopcouch/records/server.py

desktopcouch/records/server_base.py

desktopcouch/records/server_base.py

desktopcouch/records/tests/test_couchgrid.py

desktopcouch/records/tests/test_field_registry.py

desktopcouch/records/tests/test_record.py

desktopcouch/records/tests/test_server.py

desktopcouch/replication.py

desktopcouch/replication.py

desktopcouch/replication_services/

desktopcouch/replication_services/

desktopcouch/replication_services/__init__.py

desktopcouch/replication_services/__init__.py

desktopcouch/replication_services/example.py

desktopcouch/replication_services/example.py

desktopcouch/replication_services/ubuntuone.py

desktopcouch/replication_services/ubuntuone.py

po/desktopcouch.pot

Older »