git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 006890b)
Merge branch 'develop' into Jalview-JS/develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 30 Mar 2020 10:51:45 +0000 (11:51 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 30 Mar 2020 10:51:45 +0000 (11:51 +0100)
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


No differences found