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

..

de/congrace/exp4j

fixed ~150 build warnings

2012-12-16 00:12:44 -08:00

META-INF/services

moving to core/

2012-01-08 02:24:44 +00:00

net/sf/openrocket

Merge branch 'kruland-integration-motor' into

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