Clone
gmungoc <g.m.carstairs@dundee.ac.uk>
committed
17 months ago
Merge branch 'Jalview-JS/develop' into develop
Conflicts:
build.gradle
src/jalview/gui/PopupMenu.java
src/jalview/io/SequenceAnnotationRe… Show more
Merge branch 'Jalview-JS/develop' into develop

Conflicts:

        build.gradle

        src/jalview/gui/PopupMenu.java

        src/jalview/io/SequenceAnnotationReport.java

        src/jalview/io/StockholmFile.java

        src/jalview/util/DBRefUtils.java

        src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java

Show less

JAL-3416_different_look_and_feel_on_linux + 82 more