bridge/mainline - mainline

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of git://dev.laptop.org/projects/physics03	nrp	2008-08-31	1	-150/+35
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: physics.py tools.py
\| *	add concept of cost	Daniel Drake	2008-08-31	1	-206/+2
\| \|
\| *	destroy joints when excess force is applied	Daniel Drake	2008-08-30	1	-4/+2
\| \|
\| *	create a tool for adding resolute joints	Daniel Drake	2008-08-30	1	-0/+39
\| \|
* \|	adding train	nrp	2008-08-31	1	-2/+9
\|/
*	Joystick button (is awesome... in progress)	Brian Jordan	2008-07-20	1	-10/+45
\|
*	Improved toolbar automation	Alex Levenson	2008-07-16	1	-2/+2
\|
*	Fixed toolbar automation for good! Yayaya!	Alex Levenson	2008-07-16	1	-4/+9
\|
*