Merge branch 'bug/JAL-2392_deadlockonpdbdisplay' into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 25 Oct 2017 14:17:55 +0000 (15:17 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 25 Oct 2017 14:17:55 +0000 (15:17 +0100)
commit4ed4e90803e3a463458410be06b678ff3154937f
treee813da51a93ed05e7c512268dcd1864eacebbe50
parent7f3ed658b8fd9140a380cc1211674b2a0f55963e
parent944fb0771776aeb297264fca9e10a3624695831f
Merge branch 'bug/JAL-2392_deadlockonpdbdisplay' into develop
src/jalview/appletgui/AlignFrame.java
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/gui/StructureViewerBase.java
src/jalview/structure/StructureSelectionManager.java
src/jalview/ws/jws2/AbstractJabaCalcWorker.java