kruland2607 3eb96ee04d Merge branch 'tumble-recovery' into kruland-integration
Conflicts:
	core/resources/datafiles/examples/Three-stage rocket.ork
	core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java

Ignored changes to Three-stage rocket.ork since that will need to be
reproduced after the cool 3d view enhancements to the example.

The BasicEventSimulationEngine conflicts were trivial and manually
resolved.
2013-03-13 14:34:11 -05:00
..
2012-01-08 02:20:40 +00:00
2012-12-10 23:30:56 +02:00
2012-01-08 02:23:06 +00:00
2012-12-16 00:12:44 -08:00
2012-09-28 21:42:20 +00:00
2012-01-08 02:41:49 +00:00
2012-12-10 21:47:57 -06:00
2012-03-10 14:29:32 +00:00
2012-09-16 14:29:59 +00:00
2012-09-28 21:42:20 +00:00
2012-01-08 02:48:14 +00:00
2012-08-04 08:46:33 +00:00
2012-01-08 02:49:21 +00:00

OpenRocket - an Open Source model rocket simulator
--------------------------------------------------

Copyright (C) 2007-2012  Sampo Niskanen and others


For license information see the file LICENSE.TXT.

For more information see http://openrocket.sourceforge.net/



To start the software run the class 

    net.sf.openrocket.startup.Startup

or from the JAR file run

    $ java -jar OpenRocket-<VERSION>.jar



Contributions have been made by:
--------------------------------

Sampo Niskanen, main developer
Doug Pedrick, support for RockSim designs, printing
Kevin Ruland, Android version
Bill Kuker, 3D visualization
Richard Graham, geodetic computations
Jason Blood, freeform fin set import
Boris du Reau, internationalization

Translations contributed by:
Tripoli France
Tripoli Spain
Stefan Lobas / ERIG
Mauro Biasutti
Sky Dart Team
Vladimir Beran
Polish Rocketry Society / Łukasz & Alex Kazanski