kruland2607 58e5874832 Merge remote-tracking branch 'upstream/master' into sims ...

Conflicts:
	core/src/net/sf/openrocket/gui/main/SimulationPanel.java

2013-06-11 21:25:33 -05:00

..

examples

Update the preset usage example. It has lost it's presets because it

2013-05-03 12:06:00 -05:00

presets

Added presets for LocPrecision contributed by Doug.

2013-06-07 06:38:24 -05:00

textures

Reduce built-in image sizes

2013-04-24 15:06:34 -04:00

thrustcurves

Merge remote-tracking branch 'upstream/master' into sims

2013-06-11 21:25:33 -05:00

tours

Guided tour updates

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