Sampo Niskanen ef7c384f58 Merge branch 'master' into kruland-integration ...

Conflicts:
	core/build.xml
	core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
	core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
	core/src/net/sf/openrocket/gui/main/BasicFrame.java
	core/src/net/sf/openrocket/gui/util/SaveFileWorker.java
	core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
	core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java

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

..

thrustcurves.ser

Merge branch 'master' into kruland-integration

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