Simon McVittie 531321740c Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar ...

Conflicts:

	services/presence/server_plugin.py

2007-05-16 12:30:49 +01:00

..

activity

Make datastore find & update operations async

2007-05-16 00:41:45 -04:00

browser

…

clipboard

…

datastore

Make datastore find & update operations async

2007-05-16 00:41:45 -04:00

graphics

…

objects

…

p2p

…

presence

sugar.presence.presenceservice, services/presence: Use named loggers.

2007-05-15 14:58:15 +01:00

testing

…

__init__.py

…

date.py

…

env.py

Fix mozilla components loading when sugar is running from source.

2007-05-15 11:50:21 +02:00

logger.py

…

ltihooks.py

Load the modules from .la if the normal import fails

2007-04-15 15:06:04 +02:00

Makefile.am

…

profile.py

…

util.py

…