~ignacio/turtleart/irodriguez-turtleart-2-gci2013 - Unnamed repository; edit this file to name it for gitweb.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of git://git.sugarlabs.org/turtleart/mainline	Marion	2013-06-28	2	-1/+12
\|\
\| *	news for v182 v182	Walter Bender	2013-06-23	2	-1/+12
\| \|
* \|	Merge branch 'master' of git://git.sugarlabs.org/turtleart/mainline	Marion	2013-06-21	2	-474/+510
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: TurtleArt/tawindow.py -- accepted everything from mainline
\| *	parent is not activity (marion zepf)	Walter Bender	2013-06-21	2	-3/+11
\| \|
\| *	Merge branch 'master' of git.sugarlabs.org:turtleart/mainline	Walter Bender	2013-06-21	1	-467/+497
\| \|\
\| \| *