~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 'tawindow-parent-activity'	Marion	2013-06-21	2	-3/+7
\|\
\| *	resolve duplicate attribute of TurtleArtWindow: 'parent' and 'activity'	Marion	2013-06-19	2	-3/+7
\| \|
* \|	add documentation of the new parameters in tawindow	Marion	2013-06-20	1	-1/+8
\| \|
* \|	make tawindow.TurtleArtWindow._setup_misc inheritable by adding a parameter	Marion	2013-06-20	1	-4/+4
\| \|
* \|	make tawindow.TurtleArtWindow._lazy_init inheritable by adding a parameter	Marion	2013-06-20	1	-11/+13
\|/
*	Merge branch 'master' of git://git.sugarlabs.org/turtleart/mainline	Marion	2013-06-16	2	-2/+7
\|\
\| *	Merge branch 'master' of git.sugarlabs.org:turtleart/mainline	Walter Bender	2013-06-11	1	-21/+25
\| \|\
\| * \|	news for v181	Walter Bender	2013-06-11	2	-2/+7
\| \| \|
* \| \|	Merge branch 'master' of git://git.sugarlabs.org/turtleart/mainline	Marion	2013-06-07	1	-21/+25
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|