Merge branch 'develop' into task/JAL-2196pdbeProperties
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 6 Oct 2016 12:53:37 +0000 (13:53 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 6 Oct 2016 12:53:37 +0000 (13:53 +0100)
commit8546ee20c998cd48567d324027d1885a771e688f
tree6eac96b9f2908099a6f35d4bf512e488d73298f9
parente838644df5d5a10a16cf0ad7fb23d24dd7d2729a
parent1eda02547f8519e1dff46dac06734cba6c77b97f
Merge branch 'develop' into task/JAL-2196pdbeProperties
src/MCview/PDBViewer.java
src/jalview/appletgui/AlignFrame.java
src/jalview/gui/Jalview2XML.java
src/jalview/io/StructureFile.java
src/jalview/ws/dbsources/Uniprot.java
test/jalview/ws/dbsources/UniprotTest.java