Marco Pesenti Gritti d577566151 Merge branch 'master' of git+ssh://marco@dev.laptop.org/git/sugar ... Conflicts: NEWS		2007-11-09 17:38:09 +01:00
..
activity
bundle
clipboard
datastore
graphics
presence
_sugarext.defs
_sugarext.override
_sugarextmodule.c
.gitignore
.license
eggaccelerators.c
eggaccelerators.h
env.py
Makefile.am
network.py
profile.py
sexy-icon-entry.c
sexy-icon-entry.h
sound.py
sugar-address-entry.c
sugar-address-entry.h
sugar-key-grabber.c
sugar-key-grabber.h
sugar-marshal.list
sugar-menu.c
sugar-menu.h
sugar-preview.c
sugar-preview.h
util.py
wm.py