Marco Pesenti Gritti c234b7b4a3 Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar ... Conflicts: sugar/presence/Buddy.py		2006-06-22 16:01:14 -04:00
..
activity	Stop abusing ZeroConf by overloading the service type field; overload the service name field instead like everyone else does	2006-06-22 14:05:38 -04:00
chat	Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar	2006-06-22 16:01:14 -04:00
p2p
presence	Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar	2006-06-22 16:01:14 -04:00
__init__.py
__installed__.py.in
__uninstalled__.py
bots.py
env.py
LogWriter.py
Makefile.am
util.py	Stop abusing ZeroConf by overloading the service type field; overload the service name field instead like everyone else does	2006-06-22 14:05:38 -04:00