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

..

motors

Render motors nicely

2013-01-09 14:11:23 -05:00

balsa.png

Initial tube & balsa default appearances

2013-01-09 14:42:38 -05:00

spiral-wound-alpha.png

Simplify the default appearances. I am not ready to organize them into

2013-01-09 16:43:01 -05:00

wood.png

Simplify the default appearances. I am not ready to organize them into

2013-01-09 16:43:01 -05:00