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
..
google
session
__init__.py
Makefile.am
Owner.py
PresenceWindow.py	Some work getting the one-to-one chat back	2006-06-22 15:59:38 -04:00
shell.py	Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar	2006-06-22 16:01:14 -04:00
StartPage.py
sugar
WindowManager.py