sugar-toolkit-gtk3/sugar
Marco Pesenti Gritti 3b9e2c1e7e Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:

	sugar/graphics/palette.py
2007-06-26 14:55:58 +02:00
..
activity
clipboard
datastore
graphics
objects
presence
__init__.py
_sugarext.defs
_sugarext.override
_sugarextmodule.c
.gitignore
.license
date.py
env.py
logger.py
ltihooks.py
Makefile.am
network.py
profile.py
util.py
wm.py