Merge branch 'feature/JAL-3093wrappedModeTooltips' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 1 Mar 2019 14:30:03 +0000 (14:30 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 1 Mar 2019 14:30:03 +0000 (14:30 +0000)
commitf36251d568f123f14631d4839362355a058dc673
tree415e18a4d802a01a5a51f0f71a786436c47dfe26
parentc793942b6430bba9d9b6795e4afd8a1907c022d7
parentc3b91c81342d21498ffcb4639c3597a25aa2753c
Merge branch 'feature/JAL-3093wrappedModeTooltips' into
merge/JAL-3093_JAL-3132

Conflicts:
src/jalview/gui/SeqPanel.java
test/jalview/gui/SeqPanelTest.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AnnotationPanel.java
src/jalview/gui/IdPanel.java
src/jalview/gui/SeqPanel.java
src/jalview/io/FileLoader.java
test/jalview/gui/SeqPanelTest.java