JAL-722 updated from 2.11.2 develop branch - needs further work before release features/JAL-722alignmentProperties
authorJim Procter <j.procter@dundee.ac.uk>
Mon, 7 Feb 2022 12:13:26 +0000 (12:13 +0000)
committerJim Procter <j.procter@dundee.ac.uk>
Mon, 7 Feb 2022 12:13:26 +0000 (12:13 +0000)
commit48a66195bf4aee8b2c479d3bbbf4c1fb8b824f5a
tree63bc27c06dae69ea3899e4be143546a0f5b39d32
parent4d71acba1cc4999e8e4061ec3e9ae55e1b37084e
parent74237ef1010deae009bf37a34dfaa8cde0c56ced
JAL-722 updated from 2.11.2 develop branch - needs further work before release

 Conflicts:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/datamodel/Alignment.java
src/jalview/gui/AlignFrame.java
src/jalview/io/AlignFile.java
src/jalview/project/Jalview2XML.java
12 files changed:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/APopupMenu.java
src/jalview/appletgui/AlignFrame.java
src/jalview/datamodel/Alignment.java
src/jalview/datamodel/AlignmentI.java
src/jalview/gui/AlignFrame.java
src/jalview/io/AlignFile.java
src/jalview/io/AnnotationFile.java
src/jalview/io/StockholmFile.java
src/jalview/jbgui/GUserDefinedColours.java
src/jalview/project/Jalview2XML.java