Merge branch 'task/JAL-3247_JAL-3246_JAL-3254_JAL-3236_merge' into task/JAL-3141_JAL...
authorBen Soares <bsoares@dundee.ac.uk>
Mon, 27 May 2019 15:06:02 +0000 (16:06 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Mon, 27 May 2019 15:06:02 +0000 (16:06 +0100)
commit54360f0110522c5832ebabff8a8498ed4a087261
tree6008c7b813a99109f19da020c46ce3fe0d68b87c
parentb8683aaaf600239e94d658bdf99012f5e684d9a8
parent5e922f6c32e448df4e8455d87489d0464b1c41aa
Merge branch 'task/JAL-3247_JAL-3246_JAL-3254_JAL-3236_merge' into task/JAL-3141_JAL-3247_merge

merge attempt
src/jalview/gui/APQHandlers.java
src/jalview/gui/Desktop.java