Clone
gmungoc <g.m.carstairs@dundee.ac.uk>
committed
2 years and 11 months ago
JAL-3251 added optional attributes Sequence.biotype, Mapping.mappingType
Conflicts:
src/jalview/xml/binding/jalview/AlcodonFrame.java
src/… Show more
JAL-3251 added optional attributes Sequence.biotype, Mapping.mappingType

Conflicts:

        src/jalview/xml/binding/jalview/AlcodonFrame.java

        src/jalview/xml/binding/jalview/Annotation.java

        src/jalview/xml/binding/jalview/AnnotationColourScheme.java

        src/jalview/xml/binding/jalview/AnnotationElement.java

        src/jalview/xml/binding/jalview/DoubleMatrix.java

        src/jalview/xml/binding/jalview/DoubleVector.java

        src/jalview/xml/binding/jalview/Feature.java

        src/jalview/xml/binding/jalview/FeatureMatcher.java

        src/jalview/xml/binding/jalview/FeatureMatcherSet.java

        src/jalview/xml/binding/jalview/FilterBy.java

        src/jalview/xml/binding/jalview/JalviewModel.java

        src/jalview/xml/binding/jalview/JalviewUserColours.java

        src/jalview/xml/binding/jalview/MapListType.java

        src/jalview/xml/binding/jalview/Mapping.java

        src/jalview/xml/binding/jalview/NoValueColour.java

        src/jalview/xml/binding/jalview/ObjectFactory.java

        src/jalview/xml/binding/jalview/PcaDataType.java

        src/jalview/xml/binding/jalview/Pdbentry.java

        src/jalview/xml/binding/jalview/Sequence.java

        src/jalview/xml/binding/jalview/SequenceSet.java

        src/jalview/xml/binding/jalview/SequenceType.java

        src/jalview/xml/binding/jalview/ThresholdType.java

        src/jalview/xml/binding/jalview/VAMSAS.java

        src/jalview/xml/binding/jalview/WebServiceParameterSet.java

        src/jalview/xml/binding/jalview/package-info.java

Show less

master + 226 more