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

Conflicts:

        .gitignore

        build.gradle

        gradle.properties

        src/jalview/gui/AlignFrame.java

        src/jalview/gui/Desktop.java

        src/jalview/gui/FeatureSettings.java

        src/jalview/gui/JvSwingUtils.java

        src/jalview/util/MessageManager.java

        test/jalview/gui/AlignmentPanelTest.java

        test/jalview/gui/JvSwingUtilsTest.java

        test/jalview/gui/PopupMenuTest.java

        utils/eclipse/org.eclipse.jdt.core.jalview.prefs

Show less

JAL-3253_applet_omnibus-BH + 96 more