git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b61fb78 c53cc59)
Merge branch 'develop' into Jalview-JS/develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 6 Apr 2020 13:17:24 +0000 (14:17 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 6 Apr 2020 13:17:24 +0000 (14:17 +0100)
Conflicts:
build.gradle
src/jalview/gui/SeqPanel.java
build.gradle and gradle.properties changes in develop ignored

1  2 
src/jalview/gui/SeqPanel.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/SeqPanel.java
Simple merge