SiboVG 8956aa1e52 Merge branch 'unstable' into 3D-export
# Conflicts:
#	swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
#	swing/src/net/sf/openrocket/gui/util/SwingPreferences.java
2023-08-21 02:44:58 +02:00
..