Merge branch 'features/JAL-1933_occupancy' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 2 Dec 2016 15:18:04 +0000 (15:18 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 2 Dec 2016 15:18:04 +0000 (15:18 +0000)
commitf0f7259c096ec06cc8579ed62717ca93a3a45982
tree7d57531e66d1f8cacdd2cc5da0a47c32f87575e7
parentabd0918cc633b946cfea588ef4b4d666edf9fc8b
parent679e63aab1a22d128bf429a07514eb15f8b288e1
Merge branch 'features/JAL-1933_occupancy' into features/JAL-2295setChimeraAttributes