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

Some work to make group chat work again

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

p2p

Some work to make group chat work again

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

presence

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

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

session

Setup python logging and use it in the PresenceService

2006-06-17 19:54:12 -04:00

shell

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

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

__init__.py

Force themes to be olpc, so people can get

2006-06-07 16:08:14 -04:00

__installed__.py.in

…

__uninstalled__.py

…

env.py

Setup python logging and use it in the PresenceService

2006-06-17 19:54:12 -04:00

Makefile.am

Fix a bunch of outdated makefiles.

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

sugar

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

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

util.py

Accept unicode types too

2006-06-15 17:03:43 -04:00