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
..
browser	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	Some work getting the one-to-one chat back	2006-06-22 15:59:38 -04:00
Makefile.am	Forgot to add these	2006-06-21 16:06:56 -04:00