Mike's Primary Account 81d9bed0d8 Merge branch 'master' of git+ssh://mcfletch@dev.laptop.org/git/sugar ...

Conflicts:

	services/presence/buddy.py

2007-04-20 16:42:47 -04:00

..

__init__.py

Initial documentation of presence service overview.

2007-04-20 13:10:40 -04:00

activity.py

…

buddy.py

Merge branch 'master' of git+ssh://mcfletch@dev.laptop.org/git/sugar

2007-04-20 16:42:47 -04:00

buddyiconcache.py

…

linklocal_plugin.py

…

Makefile.am

PS fixes; use correct type on public keys and hide invalid buddies

2007-04-10 10:59:35 -04:00

org.laptop.Sugar.Presence.service.in

…

presenceservice.py

…

psutils.py

…

server_plugin.py

Initial documentation of presence service overview.

2007-04-20 13:10:40 -04:00

sugar-presence-service

Use sys.path.append, not insert

2007-04-15 12:26:50 +02:00