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

Conflicts:

	NEWS

2007-10-31 11:58:44 +00:00

..

activity

…

bundle

…

clipboard

…

datastore

…

graphics

…

presence

…

_sugarext.defs

Use gdk to get/set X11 properties

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

_sugarext.override

…

_sugarextmodule.c

Cleanup the source structure

2007-10-16 11:04:59 +02:00

.gitignore

Cleanup the source structure

2007-10-16 11:04:59 +02:00

.license

Cleanup the source structure

2007-10-16 11:04:59 +02:00

eggaccelerators.c

…

eggaccelerators.h

…

env.py

Fix typo in env.get_bin_path().

2007-10-18 12:57:04 +02:00

Makefile.am

…

network.py

Cleanup the source structure

2007-10-16 11:04:59 +02:00

profile.py

…

sexy-icon-entry.c

Cleanup the source structure

2007-10-16 11:04:59 +02:00

sexy-icon-entry.h

…

sugar-address-entry.c

Cleanup the source structure

2007-10-16 11:04:59 +02:00

sugar-address-entry.h

…

sugar-key-grabber.c

Cleanup the source structure

2007-10-16 11:04:59 +02:00

sugar-key-grabber.h

Cleanup the source structure

2007-10-16 11:04:59 +02:00

sugar-marshal.list

…

sugar-menu.c

Cleanup the source structure

2007-10-16 11:04:59 +02:00

sugar-menu.h

…

util.py

…

wm.py

Use gdk to get/set X11 properties

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