openrocket

Go to file

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

android

Merged changes from Release-12.09-redo tag.

2012-09-19 13:37:58 +00:00

android-libraries

Remove bin/ folders from reposiroty

2012-10-10 08:23:17 +03:00

core

Merge branch 'tumble-recovery' into kruland-integration

2013-03-13 14:34:11 -05:00

.gitignore

Merge branch 'integration' of github.com:kruland2607/openrocket

2012-12-11 08:38:59 +02:00

.travis.yml

Added config file needed for travis-ci continuous integration hosting support. Fixed places in build.xml that had hardcoded path references to use relative references. Undid fix to build warning in MotorCompare.java, since the fix didn't work with java 1.7.

2012-12-16 23:26:04 -08:00