Merge branch 'develop' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 17 Jan 2017 16:07:49 +0000 (16:07 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 17 Jan 2017 16:07:49 +0000 (16:07 +0000)
commit9d943c5feee75910c47704215a4363f25fecb859
treee26eb98797dee5eb01166f6d597b5413d7155e95
parent0ed5b947087f831b8673f4c4e423bd4ef2238a89
parentb4be31307e3a1e6d3dbb43bd14dfd012be6a3dfd
Merge branch 'develop' into features/JAL-2295setChimeraAttributes
resources/lang/Messages.properties
src/jalview/ws/sifts/SiftsClient.java