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

Always checkin to the DS from a new file.

2007-11-09 15:43:54 +01:00

bundle

Revert change committed by mistake

2007-11-04 17:19:22 +01:00

clipboard

…

datastore

…

graphics

Display meshbox invite palette menu with colored activity icon #4624

2007-11-09 10:51:43 -05:00

presence

…

_sugarext.defs

SugarPreview API improvements

2007-11-04 16:40:28 +01:00

_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

Use the right free function.

2007-11-09 17:36:09 +01:00

sugar-address-entry.h

…

sugar-key-grabber.c

…

sugar-key-grabber.h

…

sugar-marshal.list

…

sugar-menu.c

…

sugar-menu.h

…

sugar-preview.c

SugarPreview API improvements

2007-11-04 16:40:28 +01:00

sugar-preview.h

SugarPreview API improvements

2007-11-04 16:40:28 +01:00

util.py

…

wm.py

…