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
..
__init__.py
activity.py	sugar.presence.presenceservice, services/presence: Use named loggers.	2007-05-15 14:58:15 +01:00
buddy.py	sugar.presence.presenceservice, services/presence: Use named loggers.	2007-05-15 14:58:15 +01:00
buddyiconcache.py
linklocal_plugin.py
Makefile.am
org.laptop.Sugar.Presence.service.in
presenceservice.py	sugar.presence.presenceservice, services/presence: Use named loggers.	2007-05-15 14:58:15 +01:00
psutils.py	services/presence: Stop using deprecated keyword argument named_service	2007-05-15 15:20:02 +01:00
server_plugin.py	Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar	2007-05-16 12:30:49 +01:00
sugar-presence-service	sugar.presence.presenceservice, services/presence: Use named loggers.	2007-05-15 14:58:15 +01:00