kruland2607 487917b9c4 Merge remote-tracking branch 'bkuker/slf-client' into startup
Conflicts:
	core/.classpath
	core/src/net/sf/openrocket/database/Database.java
	core/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java
	core/src/net/sf/openrocket/document/OpenRocketDocument.java
	core/src/net/sf/openrocket/document/Simulation.java
	core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java
	core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
	core/src/net/sf/openrocket/file/rocksim/export/RocksimSaver.java
	core/src/net/sf/openrocket/gui/customexpression/CustomExpressionDialog.java
	core/src/net/sf/openrocket/gui/customexpression/ExpressionBuilderDialog.java
	core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java
	core/src/net/sf/openrocket/gui/customexpression/VariableSelector.java
	core/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java
	core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
	core/src/net/sf/openrocket/gui/figure3d/ComponentRenderer.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/print/visitor/CenteringRingStrategy.java
	core/src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java
	core/src/net/sf/openrocket/gui/print/visitor/PageFitPrintStrategy.java
	core/src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java
	core/src/net/sf/openrocket/gui/util/OpenFileWorker.java
	core/src/net/sf/openrocket/motor/ThrustCurveMotor.java
	core/src/net/sf/openrocket/rocketcomponent/Rocket.java
	core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
	core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
	core/src/net/sf/openrocket/simulation/SimulationOptions.java
	core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java
	core/src/net/sf/openrocket/simulation/customexpression/CustomExpressionSimulationListener.java
	core/src/net/sf/openrocket/startup/ConcurrentLoadingThrustCurveMotorSetDatabase.java
	core/src/net/sf/openrocket/util/AbstractChangeSource.java
	core/src/net/sf/openrocket/util/Coordinate.java
2013-05-08 15:14:55 -05:00
..
2013-01-27 15:01:15 -05:00
2012-10-10 22:12:34 +03:00
2012-01-08 02:19:32 +00:00
2012-01-08 02:19:32 +00:00