Merge branch 'develop' into features/JAL-2435splitScreenFont
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 30 Mar 2017 14:19:38 +0000 (15:19 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 30 Mar 2017 14:19:38 +0000 (15:19 +0100)
commit521b4513449cabf0e64b9c70c70c304d6bf2f7e3
tree02e56e06bc2ce67ef347bda5524de7ea5b1037a1
parent4772c2b206c62f3e26e66cca8396ba031ff48b3e
parentd4a9ea73ba6f86fdcb69e08529f38600db3a99fc
Merge branch 'develop' into features/JAL-2435splitScreenFont
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/api/AlignViewportI.java
src/jalview/appletgui/AlignViewport.java
src/jalview/appletgui/SeqPanel.java
src/jalview/gui/AlignViewport.java