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
..
sketchpad	Fixup the chat toolbar layout a bit	2006-06-22 09:22:23 -04:00
__init__.py
ActivityChat.py	Don't create more than one activity chat, and join a published chat when it appears	2006-06-22 14:37:34 -04:00
BuddyChat.py	Some work getting the one-to-one chat back	2006-06-22 15:59:38 -04:00
Chat.py	[hack] don't traceback when there's no network connection	2006-06-22 12:52:51 -04:00
ChatEditor.py
ChatToolbar.py	Fixup the chat toolbar layout a bit	2006-06-22 09:22:23 -04:00
ChatWindow.py
Emoticons.py
GroupChat.py
Makefile.am
MeshChat.py
old_chat.py
richtext.py	Fixup the chat toolbar layout a bit	2006-06-22 09:22:23 -04:00