531321740c
Conflicts: services/presence/server_plugin.py |
||
---|---|---|
.. | ||
__init__.py | ||
activity.py | ||
buddy.py | ||
buddyiconcache.py | ||
linklocal_plugin.py | ||
Makefile.am | ||
org.laptop.Sugar.Presence.service.in | ||
presenceservice.py | ||
psutils.py | ||
server_plugin.py | ||
sugar-presence-service |