SiboVG 4dfe63bc69 Merge branch 'unstable' into issue-875
# Conflicts:
#	core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
#	core/src/net/sf/openrocket/rocketcomponent/SymmetricComponent.java
#	core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java
#	swing/src/net/sf/openrocket/gui/main/BasicFrame.java
#	swing/src/net/sf/openrocket/gui/util/Icons.java
2023-03-08 21:29:05 +01:00
..