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

…

AddressItem.py

…

browser.activity

…

browser.py

…

browser.rc

…

BrowserActivity.py

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

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

BrowserShell.py

Pass a serialized Service object through when joining an activity

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

fold.png

…

Makefile.am

…

NavigationToolbar.py

Get activities sharing sort of working

2006-06-16 01:43:42 -04:00

NotificationBar.py

…

unfold.png

…