Simon McVittie 4391d4777a Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar ... Conflicts: NEWS		2007-10-30 12:38:32 +00:00
..
sugar	Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar	2007-10-30 12:38:32 +00:00
.gitignore	Move SugarKeyGrabber in the lib. Keep it private.	2007-06-20 15:22:12 +02:00
Makefile.am	Cleanup the source structure	2007-10-16 11:04:59 +02:00