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

..

A simple model rocket.ork

Rolled back previous attempt at un-localizing sample files. New approach will not use this file format.

2012-08-06 13:32:52 +00:00

Apocalypse with decals.ork

Update Apocalypse to use Shine & Paint

2013-01-06 09:58:43 -05:00

Boosted Dart.ork

Added descriptions, author and rocket names to new examples.

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

Clustered rocket design.ork

Rolled back previous attempt at un-localizing sample files. New approach will not use this file format.

2012-08-06 13:32:52 +00:00

High Power Airstart.ork

Added descriptions, author and rocket names to new examples.

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

Hybrid rocket with dual parachute deployment.ork

Rolled back previous attempt at un-localizing sample files. New approach will not use this file format.

2012-08-06 13:32:52 +00:00

Preset Usage.ork

Release 12.09

2012-09-16 14:29:59 +00:00

Roll-stabilized rocket.ork

Rolled back previous attempt at un-localizing sample files. New approach will not use this file format.

2012-08-06 13:32:52 +00:00

Simulation listeners.ork

Rolled back previous attempt at un-localizing sample files. New approach will not use this file format.

2012-08-06 13:32:52 +00:00

Sticker Decals.ork

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

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

TARC Payloader.ork

Added descriptions, author and rocket names to new examples.

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

Three-stage rocket.ork

Rolled back previous attempt at un-localizing sample files. New approach will not use this file format.

2012-08-06 13:32:52 +00:00