SiboVG 52f33a3429 Merge branch 'unstable' into issue-2178
# Conflicts:
#	core/src/net/sf/openrocket/simulation/FlightDataType.java
#	core/src/net/sf/openrocket/unit/UnitGroup.java
#	swing/src/net/sf/openrocket/gui/dialogs/preferences/LaunchPreferencesPanel.java
#	swing/src/net/sf/openrocket/gui/dialogs/preferences/UnitsPreferencesPanel.java
#	swing/src/net/sf/openrocket/gui/simulation/SimulationConditionsPanel.java
2023-12-01 19:28:40 +01:00
..
2022-10-15 14:32:21 -04:00
2023-05-06 16:01:02 +02:00
2022-10-15 14:32:21 -04:00
2023-03-06 20:09:14 +01:00
2023-06-28 10:50:08 +02:00