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
..
2018-06-17 15:34:55 -04:00
2023-09-17 22:32:42 +02:00
2013-11-11 09:51:53 -06:00
2023-11-17 23:32:12 +01:00
2023-09-16 18:34:35 -06:00
2023-12-01 19:28:40 +01:00
2023-02-12 02:38:39 +00:00
2023-08-16 21:20:00 +02:00
2013-09-27 11:34:46 -05:00
2013-09-27 11:34:46 -05:00
2023-08-21 02:44:58 +02:00
2023-08-16 21:20:00 +02:00