Marco Pesenti Gritti 17b3142776 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar ...

Conflicts:

	configure.ac

2007-05-21 12:47:28 +02:00

..

activity

Put dates to work correctly on the journal, create a new journal entry when resuming a past entry.

2007-05-20 12:38:08 +02:00

clipboard

…

datastore

Put dates to work correctly on the journal, create a new journal entry when resuming a past entry.

2007-05-20 12:38:08 +02:00

graphics

Don't try to display an icon without file name.

2007-05-19 11:19:56 +02:00

objects

…

p2p

…

presence

sugar.presence.presenceservice, services/presence: Use named loggers.

2007-05-15 14:58:15 +01:00

testing

…

__init__.py

…

date.py

…

env.py

Fix mozilla components loading when sugar is running from source.

2007-05-15 11:50:21 +02:00

logger.py

…

ltihooks.py

…

Makefile.am

…

profile.py

…

util.py

…