Merge branch 'develop' into features/JAL-2435splitScreenFont
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 5 May 2017 15:21:02 +0000 (16:21 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 5 May 2017 15:21:02 +0000 (16:21 +0100)
commit702cd84103cbd8c397a8d47c591c09f305605055
treeffc95e09e82ef8a6897ac3ac0990881a4584587c
parentf9e86edb330898f638ab3713b9534e9b6364a3d4
parent762dd65b19b26b7f6fb4583a476abfe173f37e49
Merge branch 'develop' into features/JAL-2435splitScreenFont
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/AlignViewport.java
src/jalview/appletgui/SeqPanel.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/SeqPanel.java
src/jalview/jbgui/GAlignFrame.java
src/jalview/viewmodel/AlignmentViewport.java