Merge branch 'merges/develop_JAL2295setChimeraAttributes' into features/JAL-1933_occu...
authorJim Procter <jprocter@issues.jalview.org>
Mon, 6 Mar 2017 14:28:06 +0000 (14:28 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 6 Mar 2017 14:28:06 +0000 (14:28 +0000)
commit529dfc85c7c4f85717d9778e49b2e61b5dfddd85
treeb213e413958afcc897ab92d7aecb634e65a56a4c
parent86d3fd6471ca878388df6abb2b01e4fe305b583a
parent2e18e422cead591bd9a1df295f1897b3e346a480
Merge branch 'merges/develop_JAL2295setChimeraAttributes' into features/JAL-1933_occupancy
update occupancy branch for other changes - will merge in with JAL-2295 and JAL-1933