Merge branch 'bug/JAL-2609attemptedmerge' into develop
authorJim Procter <jprocter@issues.jalview.org>
Mon, 23 Oct 2017 16:17:09 +0000 (17:17 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 23 Oct 2017 16:17:09 +0000 (17:17 +0100)
commit5b7c6735d44fbd8d2c3fd36ede2ae7520fc16b7e
treeaa11753fd858d9fab0bbf82a445857830b12547d
parent92e714e08b915eaa77e8daad1c33b89021b0df1a
parentfee8c0ba299ae67650716b8ebb85bd0fc51fb15a
Merge branch 'bug/JAL-2609attemptedmerge' into develop
src/jalview/gui/AlignmentPanel.java