Clone
gmungoc <g.m.carstairs@dundee.ac.uk>
committed
3 years and 3 months ago
Merge branch 'develop' into trialMerge
Conflicts:
.classpath
resources/lang/Messages.properties
resources/lang/Messages_es.properties
sr… Show more
Merge branch 'develop' into trialMerge

Conflicts:

        .classpath

        resources/lang/Messages.properties

        resources/lang/Messages_es.properties

        src/jalview/api/AlignViewportI.java

        src/jalview/fts/core/GFTSPanel.java

        src/jalview/gui/AlignFrame.java

        src/jalview/gui/AnnotationPanel.java

        src/jalview/gui/Desktop.java

        src/jalview/gui/FeatureSettings.java

        src/jalview/gui/Finder.java

        src/jalview/gui/IdPanel.java

        src/jalview/gui/Jalview2XML.java

        src/jalview/gui/PCAPanel.java

        src/jalview/gui/PopupMenu.java

        src/jalview/gui/Preferences.java

        src/jalview/gui/ScalePanel.java

        src/jalview/gui/SeqPanel.java

        src/jalview/io/JalviewFileChooser.java

        src/jalview/jbgui/GDesktop.java

        src/jalview/jbgui/GFinder.java

        src/jalview/jbgui/GPCAPanel.java

        src/jalview/util/DBRefUtils.java

        src/jalview/viewmodel/AlignmentViewport.java

        src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java

        test/jalview/io/CrossRef2xmlTests.java

        test/jalview/io/Jalview2xmlTests.java

        test/jalview/ws/dbsources/UniprotTest.java

Show less

master + 162 more