Sampo Niskanen 2db59086dd Merge branch 'kruland-integration-ui' into kruland-integration
Conflicts:
	core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java
	core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java
	core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java
2013-03-27 08:48:17 +02:00
..
2012-08-27 19:48:43 +00:00