Clone
gmungoc <g.m.carstairs@dundee.ac.uk>
committed
2 years ago
Merge branch 'develop' into feature/JAL-3390hideUnmappedStructure
Conflicts:
gradle.properties
resources/lang/Messages.properties
resourc… Show more
Merge branch 'develop' into feature/JAL-3390hideUnmappedStructure

Conflicts:

        gradle.properties

        resources/lang/Messages.properties

        resources/lang/Messages_es.properties

        src/jalview/api/structures/JalviewStructureDisplayI.java

        src/jalview/appletgui/AppletJmol.java

        src/jalview/ext/jmol/JalviewJmolBinding.java

        src/jalview/ext/jmol/JmolCommands.java

        src/jalview/ext/rbvi/chimera/AtomSpecModel.java

        src/jalview/ext/rbvi/chimera/ChimeraCommands.java

        src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java

        src/jalview/gui/AlignFrame.java

        src/jalview/gui/AlignmentPanel.java

        src/jalview/gui/AppJmol.java

        src/jalview/gui/ChimeraViewFrame.java

        src/jalview/gui/JalviewChimeraBindingModel.java

        src/jalview/gui/StructureViewerBase.java

        src/jalview/structures/models/AAStructureBindingModel.java

        test/jalview/ext/jmol/JmolCommandsTest.java

        test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java

        test/jalview/structures/models/AAStructureBindingModelTest.java

Show less