Merge branch 'releases/Release_2_10_0_Branch'
authorJim Procter <jprocter@issues.jalview.org>
Mon, 24 Oct 2016 20:27:52 +0000 (21:27 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 24 Oct 2016 20:27:52 +0000 (21:27 +0100)
commit3ab582bfeeab1563bedf60e97994e63e672d2e31
tree6d6b9795f7c375931f8ef5453b8fd90a82cbe531
parentdb93a1adcbe0a4eaaf06e0a70ade0d6c5c1961c3
parent4dc7619bed1c475c35f328601b5d7d46116327a6
Merge branch 'releases/Release_2_10_0_Branch'
32 files changed:
help/html/editing/index.html
help/html/features/structurechooser.html
help/html/features/viewingpdbs.html
help/html/releases.html
resources/embl_mapping.xml
resources/uniprot_mapping.xml
src/MCview/PDBChain.java
src/MCview/PDBViewer.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AppletJmol.java
src/jalview/datamodel/PDBEntry.java
src/jalview/datamodel/xdb/embl/EmblFile.java
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AppJmol.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/gui/Desktop.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/SeqPanel.java
src/jalview/gui/StructureChooser.java
src/jalview/gui/StructureViewer.java
src/jalview/structure/StructureSelectionManager.java
src/jalview/structures/models/AAStructureBindingModel.java
src/jalview/util/DBRefUtils.java
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/ws/dbsources/EmblXmlSource.java
src/jalview/ws/dbsources/Uniprot.java
test/jalview/gui/AlignViewportTest.java
test/jalview/gui/StructureChooserTest.java
test/jalview/structures/models/AAStructureBindingModelTest.java
test/jalview/ws/dbsources/UniprotTest.java