Sampo Niskanen 5412b8255b Merge branch 'integration' of github.com:kruland2607/openrocket ...

Conflicts:
	core/.classpath
	core/3d-Test-Junk/net/sf/openrocket/startup/Quick3dMain.java
	core/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java
	core/src/net/sf/openrocket/gui/main/BasicFrame.java

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

..

examples

Added descriptions, author and rocket names to new examples.

2012-10-26 11:57:36 -05:00

presets

Merge branch 'feature-improvepresetloading' of

2012-12-06 12:49:00 +02:00

thrustcurves

Update thrust curve files

2012-12-10 23:30:56 +02:00

tours

Guided tour updates

2012-03-17 20:19:52 +00:00