Merge branch 'develop' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 30 Nov 2016 10:48:35 +0000 (10:48 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 30 Nov 2016 10:48:35 +0000 (10:48 +0000)
commit71efdade7739028c65e30e692bef81b4496d4c3d
tree72eb0830cbab7bfd68f54c0773eaacde3cd6d0d2
parent5965127c38ff1a35d10d806c4b4537cdc1e39579
parent5f201ab4a9c02aa47c65cbc69f2d6a2669fd335e
Merge branch 'develop' into features/JAL-2295setChimeraAttributes