Merge branch 'features/JAL-2295setChimeraAttributes' into features/JAL-2351jmolExchange features/JAL-2351jmolExchange
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 8 Dec 2016 11:13:02 +0000 (11:13 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 8 Dec 2016 11:13:02 +0000 (11:13 +0000)
commit9a4238fddebd328b1c0ffb94d089fdffebc4f184
treebde18129dc58081aa6f3e95a36c83a85303df7f0
parentab506fbc0fa234dc7ce44e1d2af4944df734fe2c
parent0ed5b947087f831b8673f4c4e423bd4ef2238a89
Merge branch 'features/JAL-2295setChimeraAttributes' into features/JAL-2351jmolExchange