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
activity.py	Pass a serialized Service object through when joining an activity	2006-06-18 01:31:55 -04:00
Makefile.am
Owner.py
PresenceWindow.py
shell.py
StartPage.py	Pass a serialized Service object through when joining an activity	2006-06-18 01:31:55 -04:00
WindowManager.py