bkuker 25a3fc1d05 Merge branch 'kruland-integration-motor' into ...

kruland-integration-defaults

Conflicts:
	core/src/net/sf/openrocket/appearance/defaults/ResourceDecalImage.java
	core/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java

2013-01-10 08:46:20 -05:00

..

examples

Fix corrupted image

2013-01-08 09:22:57 -05:00

presets

Merge branch 'master' into kruland-integration

2013-01-06 19:18:46 +02:00

textures

Merge branch 'kruland-integration-motor' into

2013-01-10 08:46:20 -05:00

thrustcurves

Merge branch 'master' into kruland-integration

2013-01-06 19:18:46 +02:00

tours

Guided tour updates

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