# 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