bridge/mainline - mainline

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of git://dev.laptop.org/projects/physics03	nrp	2008-08-31	3	-193/+112
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: physics.py tools.py
\| *	add concept of cost	Daniel Drake	2008-08-31	3	-207/+12
\| \|
\| *	destroy joints when excess force is applied	Daniel Drake	2008-08-30	3	-4/+16
\| \|
\| *	create a tool for adding resolute joints	Daniel Drake	2008-08-30	3	-13/+63
\| \|
* \|	adding train	nrp	2008-08-31	4	-10/+60
\| \|
* \|	Merge branch 'master' of git://dev.laptop.org/projects/physics03	nrp	2008-08-30	2	-0/+17
\|\ \ \| \|/
\| *	Add simple world-creation code	Daniel Drake	2008-08-30	2	-0/+17
\| \|
* \|	test	nrp	2008-08-30	1	-1/+2
\|/
*	Testing commit!	brian	2008-08-30	1	-1/+1
\|
*	Joystick button (is awesome... in progress)	Brian Jordan	2008-07-20	3	-12/+48
\|
*	White background	Brian Jordan	2008-07-18	1	-1/+1
\|
*	Improved toolbar automation	Alex Levenson	2008-07-16	2	-16/+9
\|
*	finished map	Brian	2008-07-16	1	-3/+3
\|
*	Merge branch 'master' of git+ssh://bjordan@dev.laptop.org/git/activities/physics	Brian	2008-07-16	2	-10/+10
\|\
\| *	Fixed toolbar automation for good! Yayaya!	Alex Levenson	2008-07-16	2	-10/+10
\| \|
* \|	Organizational planning file, cleanup	Brian	2008-07-16	2	-23/+11
\|/
*