From: Jim Procter Date: Mon, 6 Mar 2017 14:28:06 +0000 (+0000) Subject: Merge branch 'merges/develop_JAL2295setChimeraAttributes' into features/JAL-1933_occu... X-Git-Tag: Release_2_10_2~3^2~124^2~8 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=529dfc85c7c4f85717d9778e49b2e61b5dfddd85;p=jalview.git 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 --- 529dfc85c7c4f85717d9778e49b2e61b5dfddd85