Merge branch 'bug/JAL-2358phantomChimera' into spikes/mungo
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 8 Dec 2016 09:54:47 +0000 (09:54 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 8 Dec 2016 09:54:47 +0000 (09:54 +0000)
commitfd9e6f7e0424bb69e46443d7d96237d99e792c03
treef8a2b1a14fdc60be1639593fe166f2629904196c
parent0ed5b947087f831b8673f4c4e423bd4ef2238a89
parent9b717f5894d6df63a55ab46a97f4de2e1cc18e9e
Merge branch 'bug/JAL-2358phantomChimera' into spikes/mungo

Conflicts:
src/jalview/gui/ChimeraViewFrame.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/structure/StructureSelectionManager.java