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

Typo

2006-06-21 16:10:19 -04:00

__init__.py

…

Makefile.am

Release 0.11

2006-06-21 16:18:25 -04:00

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

clarify new activity service message

2006-06-22 14:37:05 -04:00

sugar

Fix bug in path initialization

2006-06-21 16:35:57 -04:00

WindowManager.py

…