Merge branch 'develop' into features/JAL-2393customMatrices
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 28 Apr 2017 09:07:55 +0000 (10:07 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 28 Apr 2017 09:07:55 +0000 (10:07 +0100)
commitf647b9ceacdc464621491653cfb3382b42ca14a5
treef92ef4ca55c7658f2ad875cedc11d1245871b96f
parentdfc0108321583d7a9b88357b079316397d3a107f
parent17170552f73b3f9420907737e8ae6c6375afe68b
Merge branch 'develop' into features/JAL-2393customMatrices
resources/lang/Messages.properties
src/jalview/appletgui/AlignViewport.java
src/jalview/gui/AlignViewport.java