Merge branch 'feature/JAL-3180colourAnnotationMenu' into merge/JAL-3180
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 7 Mar 2019 16:12:25 +0000 (16:12 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 7 Mar 2019 16:12:25 +0000 (16:12 +0000)
commit2a7635954a40451d363a03e71393bf558413ef1e
tree2bc653892e087b8ba74ecfdc42bab9884b506282
parenta134511be07a998f7b80168dd26b632d53ed66b4
parent1aa2f97dbda5915fee0871270495596afc2c1011
Merge branch 'feature/JAL-3180colourAnnotationMenu' into merge/JAL-3180

Conflicts:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/gui/AlignFrame.java
src/jalview/gui/PopupMenu.java
src/jalview/jbgui/GAlignFrame.java
src/jalview/schemes/AnnotationColourGradient.java