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
..
browser	Merge branch 'master' of git+ssh://dcbw@crank.laptop.org/git/sugar	2006-06-18 01:33:05 -04:00
chat
p2p
presence	Merge branch 'master' of git+ssh://dcbw@crank.laptop.org/git/sugar	2006-06-18 01:33:05 -04:00
session
shell	Merge branch 'master' of git+ssh://dcbw@crank.laptop.org/git/sugar	2006-06-18 01:33:05 -04:00
__init__.py
__installed__.py.in
__uninstalled__.py
env.py
Makefile.am
sugar
util.py