Merge branch 'develop' into features/JAL-2393customMatrices
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 23 Mar 2017 09:17:31 +0000 (09:17 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 23 Mar 2017 09:17:31 +0000 (09:17 +0000)
commit76c239505d13a123cc83621623aaca16e47ddb12
treea9d4f50a417cff448b4ba31dcfdd6f79b0e27f94
parenta547c517480867ed1bbb2334ee7c51e642588a41
parent550949340ef5ccd5757dd50b11b9613d61571046
Merge branch 'develop' into features/JAL-2393customMatrices
13 files changed:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/MCview/AppletPDBCanvas.java
src/MCview/PDBCanvas.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AlignViewport.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/Jalview2XML_V1.java
src/jalview/gui/SeqPanel.java
src/jalview/structure/StructureSelectionManager.java
src/jalview/ws/sifts/SiftsClient.java