Merge branch 'develop' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 11 Nov 2016 14:02:39 +0000 (14:02 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 11 Nov 2016 14:02:39 +0000 (14:02 +0000)
commitd0df98277ba7e11e95d571f012fb371604ba0905
treea6c3d4b5c4f4d4b0ff707336f6b5b6c27e05a690
parent489580c3b488b2989892ce0df98762eb9654bfbd
parent439b1221b2728faa13d185684f58d53d67760a7f
Merge branch 'develop' into features/JAL-2295setChimeraAttributes
src/MCview/PDBChain.java
src/jalview/ws/sifts/SiftsClient.java