Merge branch 'bug/JAL-3099alignmentVisibleWidth' into merge/JAL-3099
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 4 Mar 2019 12:30:09 +0000 (12:30 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 4 Mar 2019 12:30:09 +0000 (12:30 +0000)
commit985fd5ff517f3eb5221a7aefec88138341514779
treede1d3667d9def8023fb804334a7c7747950f86a7
parent8d0d4cb4f21a2f15d61b90b0eb764041c664c81d
parent92c2fd083f7f5844693878f946441d75241f13bb
Merge branch 'bug/JAL-3099alignmentVisibleWidth' into merge/JAL-3099

Conflicts:
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/IdCanvas.java
test/jalview/datamodel/AlignmentTest.java
src/jalview/datamodel/Alignment.java
src/jalview/datamodel/AlignmentI.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/IdCanvas.java
src/jalview/gui/ScalePanel.java
src/jalview/gui/SeqCanvas.java
test/jalview/datamodel/AlignmentTest.java