Dan Williams b703d93534 Merge branch 'master' of git+ssh://dcbw@crank.laptop.org/git/sugar ...

Conflicts:

	sugar/browser/BrowserActivity.py

2006-06-18 01:33:05 -04:00

..

__init__.py

Some new files I forgot in the previous commit

2006-05-12 02:34:20 -04:00

activity.py

Pass a serialized Service object through when joining an activity

2006-06-18 01:31:55 -04:00

Makefile.am

Fix a bunch of outdated makefiles.

2006-06-15 08:38:21 -04:00

Owner.py

A pass at fixing single-computer with more than one sugar instance work

2006-06-16 15:48:44 -04:00

PresenceWindow.py

Some fixes

2006-06-16 23:24:07 -04:00

shell.py

Some work to make group chat work again

2006-06-18 01:05:40 -04:00

StartPage.py

Pass a serialized Service object through when joining an activity

2006-06-18 01:31:55 -04:00

WindowManager.py

F11 now put the activities window in fullscreen,

2006-06-15 17:31:41 -04:00