Merge branch 'features/JAL-1933_occupancy' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 5 Dec 2016 09:05:26 +0000 (09:05 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 5 Dec 2016 09:05:26 +0000 (09:05 +0000)
commitafde3a03f7de3d246c7833cd77d62a603782c997
tree3cf1a4f8b49312a9707d295cff6f70e6214c96d9
parentf0f7259c096ec06cc8579ed62717ca93a3a45982
parent86d3fd6471ca878388df6abb2b01e4fe305b583a
Merge branch 'features/JAL-1933_occupancy' into features/JAL-2295setChimeraAttributes