bkuker 7ead8bf977 Merge remote-tracking branch 'plaa/kruland-integration' into ...

kruland-integration-stickers

Conflicts:
	core/src/net/sf/openrocket/appearance/SimpleAppearanceBuilder.java
	core/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
	core/src/net/sf/openrocket/gui/figure3d/RealisticRenderStrategy.java
	core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java

2013-01-06 18:57:15 -05:00

..

examples

Merge remote-tracking branch 'plaa/kruland-integration' into

2013-01-06 18:57:15 -05:00

presets

Merge branch 'master' into kruland-integration

2013-01-06 19:18:46 +02: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