~erikos/sugar-toolkit/olpc - 0a6319ee53d171c5e8bb1a2b8d5365da71

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of git+ssh://dcbw@crank.laptop.org/git/sugar	Dan Williams	2006-06-16	3	-39/+11
\|\
\| *	Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar	Marco Pesenti Gritti	2006-06-16	1	-22/+0
\| \|\
\| * \|	Some work on the getting model back	Marco Pesenti Gritti	2006-06-16	3	-39/+11
\| \| \|
* \| \|	Test stuff to see if git is as irritating as mercurial	Dan Williams	2006-06-16	1	-0/+1
\| \|/ \|/\|
* \|	Remove unused function	Dan Williams	2006-06-16	1	-22/+0
\|/
*	Unquote title	Marco Pesenti Gritti	2006-06-16	1	-1/+1
\|
*	More unescaping...	Marco Pesenti Gritti	2006-06-16	1	-3/+15
\|
*	Fix with_id method signature	Marco Pesenti Gritti	2006-06-16	1	-2/+1
\|
*	Get activities sharing sort of working	Marco Pesenti Gritti	2006-06-16	6	-35/+57
\|
*	Merge	Marco Pesenti Gritti	2006-06-15	2	-1/+2
\|
*	Fix the problem with service resolution (Dan please have a look...)	Marco Pesenti Gritti	2006-06-15	3	-29/+28
\|
*	Shorten activity service type	Dan Williams	2006-06-15	1	-1/+1
\|
*	remove debug print	Dan Williams	2006-06-15	1	-0/+1
\|
*	Merge with Marco	Dan Williams	2006-06-15	3	-6/+17
\|
*	Hook into PresenceService to find new advertisements and track them	Dan Williams	2006-06-15	1	-2/+20
\|
*