Simon McVittie 4f41f300d8 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar ...

Conflicts:

	NEWS

2007-10-17 11:54:33 +01:00

..

activity

Try to make sugar.presence log messages less misleading (#4027)

2007-10-16 17:51:36 +01:00

bundle

…

clipboard

…

datastore

One more fix for resuming.

2007-10-16 17:39:27 +02:00

graphics

Fix the object chooser

2007-10-16 23:51:28 +02:00

presence

Try to make sugar.presence log messages less misleading (#4027)

2007-10-16 17:51:36 +01:00

_sugarext.defs

Use gdk to get/set X11 properties

2007-10-16 11:50:11 +02:00

_sugarext.override

Use gdk to get/set X11 properties

2007-10-16 11:50:11 +02:00

_sugarextmodule.c

…

.gitignore

…

.license

…

eggaccelerators.c

…

eggaccelerators.h

…

env.py

…

Makefile.am

Simplify the API to get icon/description for objects.

2007-10-16 17:18:43 +02:00

network.py

…

profile.py

…

sexy-icon-entry.c

…

sexy-icon-entry.h

…

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

…

util.py

…

wm.py

Use gdk to get/set X11 properties

2007-10-16 11:50:11 +02:00